1 files changed, 10 insertions, 2 deletions
diff --git a/Swiften/Network/BoostIOServiceThread.h b/Swiften/Network/BoostIOServiceThread.h
index 37047d1..428837b 100644
--- a/Swiften/Network/BoostIOServiceThread.h
+++ b/Swiften/Network/BoostIOServiceThread.h
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
@@ -12,13 +12,21 @@
 
 #include <Swiften/Base/API.h>
 
 namespace Swift {
 	class SWIFTEN_API BoostIOServiceThread {
 		public:
-			BoostIOServiceThread();
+			/**
+			 * Construct the object.
+			 * @param ioService If this optional parameter is provided, the behaviour
+			 * of this class changes completely - it no longer spawns its own thread
+			 * and instead acts as a simple wrapper of the io_service. Use this if
+			 * you are re-using an io_service from elsewhere (particularly if you
+		   * are using the BoostASIOEventLoop).
+			 */
+			BoostIOServiceThread(boost::shared_ptr<boost::asio::io_service> ioService = boost::shared_ptr<boost::asio::io_service>());
 			~BoostIOServiceThread();
 
 			boost::shared_ptr<boost::asio::io_service> getIOService() const {
 				return ioService_;
 			}