diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-22 17:09:25 -0400 |
| commit | 752e06b4eb63abb8a30bb958802eaedda72d3806 (patch) | |
| tree | 7c2348544d202c310a55a62629abc4025daa03a5 /cpp/src/IceIAP | |
| parent | Disable VS 2015 update 3 optimizer (diff) | |
| download | ice-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/src/IceIAP')
| -rw-r--r-- | cpp/src/IceIAP/Transceiver.h | 5 | ||||
| -rw-r--r-- | cpp/src/IceIAP/Transceiver.mm | 4 |
2 files changed, 1 insertions, 8 deletions
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&); diff --git a/cpp/src/IceIAP/Transceiver.mm b/cpp/src/IceIAP/Transceiver.mm index 23496965421..0d7c332120d 100644 --- a/cpp/src/IceIAP/Transceiver.mm +++ b/cpp/src/IceIAP/Transceiver.mm @@ -254,11 +254,7 @@ IceObjC::iAPTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer) } SocketOperation -#ifdef ICE_CPP11_MAPPING -IceObjC::iAPTransceiver::closing(bool initiator, exception_ptr) -#else IceObjC::iAPTransceiver::closing(bool initiator, const Ice::LocalException&) -#endif { // If we are initiating the connection closure, wait for the peer // to close the TCP/IP connection. Otherwise, close immediately. |