1 files changed, 19 insertions, 17 deletions
diff --git a/Swiften/Network/BoostIOServiceThread.cpp b/Swiften/Network/BoostIOServiceThread.cpp
index af74c85..756e660 100644
--- a/Swiften/Network/BoostIOServiceThread.cpp
+++ b/Swiften/Network/BoostIOServiceThread.cpp
@@ -6,32 +6,34 @@
 
 #include <Swiften/Network/BoostIOServiceThread.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
+
+#include <boost/bind.hpp>
 
 namespace Swift {
 
-BoostIOServiceThread::BoostIOServiceThread(boost::shared_ptr<boost::asio::io_service> ioService) {
-	if (!!ioService) {
-		ioService_ = ioService;
-		thread_ = NULL;
-	}
-	else {
-		ioService_ = boost::make_shared<boost::asio::io_service>();
-		thread_ = new boost::thread(boost::bind(&BoostIOServiceThread::doRun, this));
-	}
+BoostIOServiceThread::BoostIOServiceThread(std::shared_ptr<boost::asio::io_service> ioService) {
+    if (!!ioService) {
+        ioService_ = ioService;
+        thread_ = nullptr;
+    }
+    else {
+        ioService_ = std::make_shared<boost::asio::io_service>();
+        thread_ = new std::thread(boost::bind(&BoostIOServiceThread::doRun, this));
+    }
 }
 
 BoostIOServiceThread::~BoostIOServiceThread() {
-	if (thread_) {
-		ioService_->stop();
-		thread_->join();
-		delete thread_;
-	}
+    if (thread_) {
+        ioService_->stop();
+        thread_->join();
+        delete thread_;
+    }
 }
 
 void BoostIOServiceThread::doRun() {
-	boost::asio::io_service::work work(*ioService_);
-	ioService_->run();
+    boost::asio::io_service::work work(*ioService_);
+    ioService_->run();
 }
 
 }