diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-06-18 16:34:04 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-06-18 16:34:04 (GMT) |
commit | c31ab7f87ea33b4e1de2ae28c3c9e5263de23b77 (patch) | |
tree | d849f6bf26774e08601c860801a815bdf31c5bfe /Swiften/Network/BoostNetworkFactories.h | |
parent | ed0dbffeb8a3b36965d359c8a689bdb41372e481 (diff) | |
parent | 7d0e9c3d963ffcb3f7d6d313dfa55466beb742b9 (diff) | |
download | swift-contrib-c31ab7f87ea33b4e1de2ae28c3c9e5263de23b77.zip swift-contrib-c31ab7f87ea33b4e1de2ae28c3c9e5263de23b77.tar.bz2 |
Merge branch 'swift-1.x'
* swift-1.x:
Small tweaks to the previous patch.
Added ConnectionServerFactory.
Conflicts:
Swiften/Network/SConscript
Diffstat (limited to 'Swiften/Network/BoostNetworkFactories.h')
-rw-r--r-- | Swiften/Network/BoostNetworkFactories.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Swiften/Network/BoostNetworkFactories.h b/Swiften/Network/BoostNetworkFactories.h index abb155c..96bcc6c 100644 --- a/Swiften/Network/BoostNetworkFactories.h +++ b/Swiften/Network/BoostNetworkFactories.h @@ -33,10 +33,15 @@ namespace Swift { return domainNameResolver; } + ConnectionServerFactory* getConnectionServerFactory() const { + return connectionServerFactory; + } + private: BoostIOServiceThread ioServiceThread; TimerFactory* timerFactory; ConnectionFactory* connectionFactory; DomainNameResolver* domainNameResolver; + ConnectionServerFactory* connectionServerFactory; }; } |