diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-03-08 19:37:13 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-03-08 19:37:13 -0500 |
| commit | 11678336dea1f3676881b87bbe8ca3e3cb6b5296 (patch) | |
| tree | ec4bbc16d9fdfe1f9c48f374f26169ba4e88cb3a /cpp/src/IceGrid/Activator.cpp | |
| parent | Python thread hook fixes (diff) | |
| download | ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.bz2 ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.tar.xz ice-11678336dea1f3676881b87bbe8ca3e3cb6b5296.zip | |
Removed Current's default value in the C++11 mapping
Renamed Ice::noExplicitCurrent to Ice::emptyCurrent
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 6dea80ccc53..eac4e13761a 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -1095,7 +1095,7 @@ Activator::destroy() // try { - p->second.server->stop_async(0); + p->second.server->stop_async(0, Ice::emptyCurrent); } catch(const ServerStopException&) { |