summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Incoming.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-02-03 10:42:29 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-02-03 10:42:29 +0100
commit18a6720fcc3ece576f5fb26283e239cda2bebadd (patch)
treea7d9de0acab9e092943fb182fa880b2c4b950db6 /cpp/src/Ice/Incoming.cpp
parentICE-6861 - Java stream API changes (diff)
downloadice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.bz2
ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.xz
ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.zip
Refactored invocation code to better suite new C++11 mapping
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
-rw-r--r--cpp/src/Ice/Incoming.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index fafdb3cce83..691c43a91d2 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -557,16 +557,16 @@ IceInternal::Incoming::killAsync()
}
void
-IceInternal::Incoming::setActive(IncomingAsync& cb)
+IceInternal::Incoming::setActive(IncomingAsyncPtr cb)
{
assert(_cb == 0);
//
// acquires a ref-count
//
#ifdef ICE_CPP11_MAPPING
- _cb = cb.shared_from_this();
+ _cb = move(cb);
#else
- _cb = &cb;
+ _cb = cb;
#endif
}