1 files changed, 22 insertions, 12 deletions
diff --git a/Swiften/Network/BoostIOServiceThread.cpp b/Swiften/Network/BoostIOServiceThread.cpp
index c98a653..756e660 100644
--- a/Swiften/Network/BoostIOServiceThread.cpp
+++ b/Swiften/Network/BoostIOServiceThread.cpp
@@ -1,29 +1,39 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/BoostIOServiceThread.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
+
+#include <boost/bind.hpp>
 
 namespace Swift {
 
-BoostIOServiceThread::BoostIOServiceThread() {
-	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() {
-	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();
 }
 
 }