summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2015-09-17 18:21:44 (GMT)
committerSwift Review <review@swift.im>2015-12-17 08:58:51 (GMT)
commit9bce26254aa3c2feffdd751b59cdee5e903fd2bc (patch)
tree27bf31b4564216db6bf74818dc76f0ba23af074e /Swiften/Network/BoostNetworkFactories.h
parentbea3559998c0ae0a2afca566046f08d0a201c0b2 (diff)
downloadswift-9bce26254aa3c2feffdd751b59cdee5e903fd2bc.zip
swift-9bce26254aa3c2feffdd751b59cdee5e903fd2bc.tar.bz2
Add event loop for integration in Boost ASIO
This allows execution of events inside an existing io_service if an application is already using Boost ASIO for other things and can share the io_service. Test-Information: Builds on OS X 10.11.2. Change-Id: I092ed7a25b24ef95d4664bae98ed84cc0f149073
Diffstat (limited to 'Swiften/Network/BoostNetworkFactories.h')
-rw-r--r--Swiften/Network/BoostNetworkFactories.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.h b/Swiften/Network/BoostNetworkFactories.h
index 32fdd93..12755b9 100644
--- a/Swiften/Network/BoostNetworkFactories.h
+++ b/Swiften/Network/BoostNetworkFactories.h
@@ -8,8 +8,8 @@
#include <Swiften/Base/API.h>
#include <Swiften/Base/Override.h>
-#include <Swiften/Network/NetworkFactories.h>
#include <Swiften/Network/BoostIOServiceThread.h>
+#include <Swiften/Network/NetworkFactories.h>
namespace Swift {
class EventLoop;
@@ -18,7 +18,12 @@ namespace Swift {
class SWIFTEN_API BoostNetworkFactories : public NetworkFactories {
public:
- BoostNetworkFactories(EventLoop* eventLoop);
+ /**
+ * Construct the network factories, using the provided EventLoop.
+ * @param ioService If this optional parameter is provided, it will be
+ * used for the construction of the BoostIOServiceThread.
+ */
+ BoostNetworkFactories(EventLoop* eventLoop, boost::shared_ptr<boost::asio::io_service> ioService = boost::shared_ptr<boost::asio::io_service>());
virtual ~BoostNetworkFactories();
virtual TimerFactory* getTimerFactory() const SWIFTEN_OVERRIDE {