summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/background/Transceiver.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-07-22 17:09:25 -0400
committerBernard Normier <bernard@zeroc.com>2016-07-22 17:09:25 -0400
commit752e06b4eb63abb8a30bb958802eaedda72d3806 (patch)
tree7c2348544d202c310a55a62629abc4025daa03a5 /cpp/test/Ice/background/Transceiver.cpp
parentDisable VS 2015 update 3 optimizer (diff)
downloadice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.bz2
ice-752e06b4eb63abb8a30bb958802eaedda72d3806.tar.xz
ice-752e06b4eb63abb8a30bb958802eaedda72d3806.zip
Added ICE_BUILDING_SRC to make builds
Ice::Dispatcher and Ice::LocalObject are now hidden with C++11 Reworked C++11 exception ice_clone, added ExceptionHelper + other C++ cleanups
Diffstat (limited to 'cpp/test/Ice/background/Transceiver.cpp')
-rw-r--r--cpp/test/Ice/background/Transceiver.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/test/Ice/background/Transceiver.cpp b/cpp/test/Ice/background/Transceiver.cpp
index 50920d04b14..18396d6e00f 100644
--- a/cpp/test/Ice/background/Transceiver.cpp
+++ b/cpp/test/Ice/background/Transceiver.cpp
@@ -59,11 +59,7 @@ Transceiver::initialize(IceInternal::Buffer& readBuffer, IceInternal::Buffer& wr
}
IceInternal::SocketOperation
-#ifdef ICE_CPP11_MAPPING
-Transceiver::closing(bool initiator, exception_ptr ex)
-#else
Transceiver::closing(bool initiator, const Ice::LocalException& ex)
-#endif
{
return _transceiver->closing(initiator, ex);
}