summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox/ServiceManagerI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-12 10:09:44 +0100
committerJose <jose@zeroc.com>2016-01-12 10:09:44 +0100
commit2688fda259617cda9eaee46530cc4bb63999d327 (patch)
treef9b203c82e69cd3028ef1f0ba3a6a22f371ee48b /cpp/src/IceBox/ServiceManagerI.cpp
parentFixed ICE-6960 - Ice/objects rpath issue to find TestCommon (diff)
downloadice-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/IceBox/ServiceManagerI.cpp')
-rw-r--r--cpp/src/IceBox/ServiceManagerI.cpp3
1 files changed, 2 insertions, 1 deletions
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)