diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Glacier2Lib/Application.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/LoggerAdminI.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceLocatorDiscovery/PluginI.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 |
7 files changed, 17 insertions, 11 deletions
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp index 24e6c35afc2..b8edf35c07c 100644 --- a/cpp/src/Glacier2Lib/Application.cpp +++ b/cpp/src/Glacier2Lib/Application.cpp @@ -200,8 +200,9 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat assert(connection); connection->setACM(acmTimeout, IceUtil::None, Ice::HeartbeatAlways); #ifdef ICE_CPP11_MAPPING + auto self = weak_from_this(); connection->setCloseCallback( - [self = weak_from_this()](Ice::ConnectionPtr) + [self](Ice::ConnectionPtr) { auto s = self.lock(); if(s) diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 2aebb4cfc30..1b1a630d3af 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -805,7 +805,8 @@ SessionHelperI::connected(const Glacier2::RouterPrxPtr& router, const Glacier2:: assert(connection); connection->setACM(acmTimeout, IceUtil::None, Ice::HeartbeatAlways); #ifdef ICE_CPP11_MAPPING - connection->setCloseCallback([self = shared_from_this()](Ice::ConnectionPtr) + auto self = shared_from_this(); + connection->setCloseCallback([self](Ice::ConnectionPtr) { self->destroy(); }); diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp index 113283a8d77..a7587c238e6 100644 --- a/cpp/src/Ice/LoggerAdminI.cpp +++ b/cpp/src/Ice/LoggerAdminI.cpp @@ -415,8 +415,9 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, #ifdef ICE_CPP11_MAPPING try { + auto self = shared_from_this(); remoteLogger->init_async(logger->getPrefix(), initLogMessages, - [self = shared_from_this(), logger, remoteLogger]() + [self, logger, remoteLogger]() { if(self->_traceLevel > 1) { @@ -424,7 +425,7 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx, trace << "init on `" << remoteLogger << "' completed successfully"; } }, - [self = shared_from_this(), logger, remoteLogger](exception_ptr e) + [self, logger, remoteLogger](exception_ptr e) { try { @@ -853,8 +854,9 @@ LoggerAdminLoggerI::run() { #ifdef ICE_CPP11_MAPPING RemoteLoggerPrxPtr remoteLogger = *p; + auto self = shared_from_this(); remoteLogger->log_async(job->logMessage, - [self = shared_from_this(), remoteLogger]() + [self, remoteLogger]() { if(self->_loggerAdmin->getTraceLevel() > 1) { @@ -862,7 +864,7 @@ LoggerAdminLoggerI::run() trace << "log on `" << remoteLogger << "' completed successfully"; } }, - [self = shared_from_this(), remoteLogger](exception_ptr e) + [self, remoteLogger](exception_ptr e) { try { diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 0c43fb40aa3..895fbced78b 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -97,7 +97,7 @@ Ice::ObjectPrx::ice_isA_async(const string& typeId, os->write(typeId); }, false, - [response = move(response)](IceInternal::BasicStream* is) + [response](IceInternal::BasicStream* is) { bool ret; is->read(ret); diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 27f7eb5db94..9577561652d 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -913,7 +913,8 @@ IceBox::ServiceManagerI::stopAll() function<void (exception_ptr)> IceBox::ServiceManagerI::makeObserverCompletedCallback(const shared_ptr<ServiceObserverPrx>& observer) { - return [self = weak_from_this(), observer](exception_ptr ex) + auto self = weak_from_this(); + return [self, observer](exception_ptr ex) { auto s = self.lock(); if(s) diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp index 4ca7b6ec35e..e96e62dfca6 100644 --- a/cpp/src/IceLocatorDiscovery/PluginI.cpp +++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp @@ -370,8 +370,9 @@ Request::invoke(const Ice::LocatorPrxPtr& l) _locatorPrx = l; try { + auto self = shared_from_this(); l->ice_invoke_async(_operation, _mode, _inParams, - [self = shared_from_this()](bool ok, vector<Ice::Byte> outParams) + [self](bool ok, vector<Ice::Byte> outParams) { pair<const Ice::Byte*, const Ice::Byte*> outPair; if(outParams.empty()) @@ -385,7 +386,7 @@ Request::invoke(const Ice::LocatorPrxPtr& l) } self->response(ok, move(outPair)); }, - [self = shared_from_this()](exception_ptr e) + [self](exception_ptr e) { try { diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index f390ce4ce13..76d950bc097 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -6557,7 +6557,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) if(ret || !outParams.empty()) { C << nl << "false" << ","; - C << nl << "[__response = ::std::move(__response)](::IceInternal::BasicStream* __is)"; + C << nl << "[__response](::IceInternal::BasicStream* __is)"; C << sb; writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd | TypeContextReadClosure, true); writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd); |