From 752e06b4eb63abb8a30bb958802eaedda72d3806 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Fri, 22 Jul 2016 17:09:25 -0400 Subject: 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 --- cpp/src/IceIAP/Transceiver.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cpp/src/IceIAP/Transceiver.h') diff --git a/cpp/src/IceIAP/Transceiver.h b/cpp/src/IceIAP/Transceiver.h index b82ed27c395..ee625845713 100644 --- a/cpp/src/IceIAP/Transceiver.h +++ b/cpp/src/IceIAP/Transceiver.h @@ -45,11 +45,8 @@ public: virtual IceInternal::NativeInfoPtr getNativeInfo(); virtual IceInternal::SocketOperation initialize(IceInternal::Buffer&, IceInternal::Buffer&); -#ifdef ICE_CPP11_MAPPING - virtual IceInternal::SocketOperation closing(bool, std::exception_ptr); -#else + virtual IceInternal::SocketOperation closing(bool, const Ice::LocalException&); -#endif virtual void close(); virtual IceInternal::SocketOperation write(IceInternal::Buffer&); virtual IceInternal::SocketOperation read(IceInternal::Buffer&); -- cgit v1.2.3