1 files changed, 59 insertions, 57 deletions
diff --git a/Swiften/Network/BoostConnection.h b/Swiften/Network/BoostConnection.h
index f933cd8..03122da 100644
--- a/Swiften/Network/BoostConnection.h
+++ b/Swiften/Network/BoostConnection.h
@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <memory>
+#include <mutex>
+
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/thread/mutex.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
@@ -20,61 +21,62 @@
 #include <Swiften/TLS/CertificateWithKey.h>
 
 namespace boost {
-	class thread;
-	namespace system {
-		class error_code;
-	}
+    class thread;
+    namespace system {
+        class error_code;
+    }
 }
 
 namespace Swift {
-	class EventLoop;
-
-	class SWIFTEN_API BoostConnection : public Connection, public EventOwner, public boost::enable_shared_from_this<BoostConnection> {
-		public:
-			typedef boost::shared_ptr<BoostConnection> ref;
-
-			virtual ~BoostConnection();
-
-			static ref create(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
-				return ref(new BoostConnection(ioService, eventLoop));
-			}
-
-			virtual void listen();
-			virtual void connect(const HostAddressPort& address);
-			virtual void disconnect();
-			virtual void write(const SafeByteArray& data);
-
-			boost::asio::ip::tcp::socket& getSocket() {
-				return socket_;
-			}
-
-			virtual HostAddressPort getLocalAddress() const;
-			virtual HostAddressPort getRemoteAddress() const;
-
-			bool setClientCertificate(CertificateWithKey::ref cert);
-
-			Certificate::ref getPeerCertificate() const;
-			std::vector<Certificate::ref> getPeerCertificateChain() const;
-			boost::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const;
-
-		private:
-			BoostConnection(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
-
-			void handleConnectFinished(const boost::system::error_code& error);
-			void handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred);
-			void handleDataWritten(const boost::system::error_code& error);
-			void doRead();
-			void doWrite(const SafeByteArray& data);
-			void closeSocket();
-
-		private:
-			EventLoop* eventLoop;
-			boost::shared_ptr<boost::asio::io_service> ioService;
-			boost::asio::ip::tcp::socket socket_;
-			boost::shared_ptr<SafeByteArray> readBuffer_;
-			boost::mutex writeMutex_;
-			bool writing_;
-			SafeByteArray writeQueue_;
-			bool closeSocketAfterNextWrite_;
-	};
+    class EventLoop;
+
+    class SWIFTEN_API BoostConnection : public Connection, public EventOwner, public std::enable_shared_from_this<BoostConnection> {
+        public:
+            typedef std::shared_ptr<BoostConnection> ref;
+
+            virtual ~BoostConnection();
+
+            static ref create(std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
+                return ref(new BoostConnection(ioService, eventLoop));
+            }
+
+            virtual void listen();
+            virtual void connect(const HostAddressPort& address);
+            virtual void disconnect();
+            virtual void write(const SafeByteArray& data);
+
+            boost::asio::ip::tcp::socket& getSocket() {
+                return socket_;
+            }
+
+            virtual HostAddressPort getLocalAddress() const;
+            virtual HostAddressPort getRemoteAddress() const;
+
+            bool setClientCertificate(CertificateWithKey::ref cert);
+
+            Certificate::ref getPeerCertificate() const;
+            std::vector<Certificate::ref> getPeerCertificateChain() const;
+            std::shared_ptr<CertificateVerificationError> getPeerCertificateVerificationError() const;
+
+        private:
+            BoostConnection(std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
+
+            void handleConnectFinished(const boost::system::error_code& error);
+            void handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred);
+            void handleDataWritten(const boost::system::error_code& error);
+            void doRead();
+            void doWrite(const SafeByteArray& data);
+            void closeSocket();
+
+        private:
+            EventLoop* eventLoop;
+            std::shared_ptr<boost::asio::io_service> ioService;
+            boost::asio::ip::tcp::socket socket_;
+            std::shared_ptr<SafeByteArray> readBuffer_;
+            std::mutex writeMutex_;
+            bool writing_;
+            SafeByteArray writeQueue_;
+            bool closeSocketAfterNextWrite_;
+            std::mutex readCloseMutex_;
+    };
 }