summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ObjectAdapterI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-01-26 18:12:02 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-01-26 18:12:02 +0100
commitb0f45efeb19159bdda8e62d0abdfc150d50b8c2b (patch)
tree1b1fb7ce858d9cfc9c43f0be4beee97ab1c76d40 /cpp/src/Ice/ObjectAdapterI.cpp
parentFixed JS tests to run again Ice/exceptions and optionals test with bidir (diff)
downloadice-b0f45efeb19159bdda8e62d0abdfc150d50b8c2b.tar.bz2
ice-b0f45efeb19159bdda8e62d0abdfc150d50b8c2b.tar.xz
ice-b0f45efeb19159bdda8e62d0abdfc150d50b8c2b.zip
Fixed ICE-6920 - Communicator::destroy is now noexcept
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.cpp')
-rw-r--r--cpp/src/Ice/ObjectAdapterI.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index e3b9cb2450c..ac60baa4a0c 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -346,7 +346,7 @@ Ice::ObjectAdapterI::isDeactivated() const
}
void
-Ice::ObjectAdapterI::destroy()
+Ice::ObjectAdapterI::destroy() ICE_NOEXCEPT
{
//
// Deactivate and wait for completion.