summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionFactory.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-05-31 08:59:20 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-05-31 08:59:20 +0200
commit9f99bad130508d529814c778852621f6a1b814cc (patch)
tree4fa8328539c80f719cca38a0fb7f67b2995618fc /cpp/src/Ice/ConnectionFactory.cpp
parentPHP 7 fix for printing Exception info (diff)
downloadice-9f99bad130508d529814c778852621f6a1b814cc.tar.bz2
ice-9f99bad130508d529814c778852621f6a1b814cc.tar.xz
ice-9f99bad130508d529814c778852621f6a1b814cc.zip
Added support for building Xcode SDK, added iAP transport
Diffstat (limited to 'cpp/src/Ice/ConnectionFactory.cpp')
-rw-r--r--cpp/src/Ice/ConnectionFactory.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 43dc7f670ce..dbfc20e9a94 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -32,8 +32,8 @@
namespace IceInternal
{
-bool registerForBackgroundNotification(IceInternal::IncomingConnectionFactory*);
-void unregisterForBackgroundNotification(IceInternal::IncomingConnectionFactory*);
+bool registerForBackgroundNotification(const IceInternal::IncomingConnectionFactoryPtr&);
+void unregisterForBackgroundNotification(const IceInternal::IncomingConnectionFactoryPtr&);
}
#endif
@@ -1461,7 +1461,7 @@ IceInternal::IncomingConnectionFactory::finished(ThreadPoolCurrent&, bool close)
#if TARGET_OS_IPHONE != 0
sync.release();
- unregisterForBackgroundNotification(this);
+ unregisterForBackgroundNotification(shared_from_this());
#endif
}
@@ -1581,7 +1581,7 @@ IceInternal::IncomingConnectionFactory::stopAcceptor()
return;
}
- if(_adapter->getThreadPool()->finish(this, true))
+ if(_adapter->getThreadPool()->finish(shared_from_this(), true))
{
_acceptorStarted = false;
closeAcceptor();
@@ -1625,7 +1625,7 @@ IceInternal::IncomingConnectionFactory::initialize()
// start the acceptor if necessary.
//
_acceptorStarted = false;
- registerForBackgroundNotification(this);
+ registerForBackgroundNotification(shared_from_this());
#else
createAcceptor();
#endif