Merge commit '2.5.0' into moonshot-packaging-fixes

[shibboleth/sp.git] / shibsp / remoting / impl / SocketListener.h

diff --git a/shibsp/remoting/impl/SocketListener.h b/shibsp/remoting/impl/SocketListener.h
index e6b4fed..5c6e34b 100644 (file)
--- a/shibsp/remoting/impl/SocketListener.h
+++ b/shibsp/remoting/impl/SocketListener.h
@@ -33,6 +33,7 @@
 
 #include <shibsp/remoting/ListenerService.h>
 
+#include <boost/scoped_ptr.hpp>
 #include <xercesc/dom/DOM.hpp>
 #include <xmltooling/logging.h>
 #include <xmltooling/util/Threads.h>
@@ -83,14 +84,14 @@ namespace shibsp {
         /// @endcond
 
     private:
-        mutable SocketPool* m_socketpool;
+        boost::scoped_ptr<SocketPool> m_socketpool;
         bool* m_shutdown;
 
         // Manage child threads
         friend class ServerThread;
         std::map<ShibSocket,xmltooling::Thread*> m_children;
-        xmltooling::Mutex* m_child_lock;
-        xmltooling::CondWait* m_child_wait;
+        boost::scoped_ptr<xmltooling::Mutex> m_child_lock;
+        boost::scoped_ptr<xmltooling::CondWait> m_child_wait;
 
         unsigned int m_stackSize;