diff options
| author | Jose <jose@zeroc.com> | 2016-01-12 10:09:44 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-12 10:09:44 +0100 |
| commit | 2688fda259617cda9eaee46530cc4bb63999d327 (patch) | |
| tree | f9b203c82e69cd3028ef1f0ba3a6a22f371ee48b /cpp/src/Ice/LoggerAdminI.cpp | |
| parent | Fixed ICE-6960 - Ice/objects rpath issue to find TestCommon (diff) | |
| download | ice-2688fda259617cda9eaee46530cc4bb63999d327.tar.bz2 ice-2688fda259617cda9eaee46530cc4bb63999d327.tar.xz ice-2688fda259617cda9eaee46530cc4bb63999d327.zip | |
Remove C++14 usage and switch to -std=c++11
Diffstat (limited to 'cpp/src/Ice/LoggerAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/LoggerAdminI.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 { |