1 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h
index 8ee2a6d..b8a1c64 100644
--- a/Swiften/Network/BoostConnectionServer.h
+++ b/Swiften/Network/BoostConnectionServer.h
@@ -6,11 +6,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/ip/tcp.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include <boost/optional/optional_fwd.hpp>
-#include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
@@ -19,15 +19,15 @@
 #include <Swiften/Network/ConnectionServer.h>
 
 namespace Swift {
-    class SWIFTEN_API BoostConnectionServer : public ConnectionServer, public EventOwner, public boost::enable_shared_from_this<BoostConnectionServer> {
+    class SWIFTEN_API BoostConnectionServer : public ConnectionServer, public EventOwner, public std::enable_shared_from_this<BoostConnectionServer> {
         public:
-            typedef boost::shared_ptr<BoostConnectionServer> ref;
+            typedef std::shared_ptr<BoostConnectionServer> ref;
 
-            static ref create(int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
+            static ref create(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
                 return ref(new BoostConnectionServer(port, ioService, eventLoop));
             }
 
-            static ref create(const HostAddress &address, int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
+            static ref create(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
                 return ref(new BoostConnectionServer(address, port, ioService, eventLoop));
             }
 
@@ -40,17 +40,17 @@ namespace Swift {
             boost::signal<void (boost::optional<Error>)> onStopped;
 
         private:
-            BoostConnectionServer(int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
-            BoostConnectionServer(const HostAddress &address, int port, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
+            BoostConnectionServer(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
+            BoostConnectionServer(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
 
             void stop(boost::optional<Error> e);
             void acceptNextConnection();
-            void handleAccept(boost::shared_ptr<BoostConnection> newConnection, const boost::system::error_code& error);
+            void handleAccept(std::shared_ptr<BoostConnection> newConnection, const boost::system::error_code& error);
 
         private:
             HostAddress address_;
             int port_;
-            boost::shared_ptr<boost::asio::io_service> ioService_;
+            std::shared_ptr<boost::asio::io_service> ioService_;
             EventLoop* eventLoop;
             boost::asio::ip::tcp::acceptor* acceptor_;
     };