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/Ice/WSTransceiver.cpp | |
| 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/Ice/WSTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/WSTransceiver.cpp | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp index 24d97b89920..0c33cfe8d8f 100644 --- a/cpp/src/Ice/WSTransceiver.cpp +++ b/cpp/src/Ice/WSTransceiver.cpp @@ -410,11 +410,7 @@ IceInternal::WSTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer) } SocketOperation -#ifdef ICE_CPP11_MAPPING -IceInternal::WSTransceiver::closing(bool initiator, exception_ptr reason) -#else IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& reason) -#endif { if(_instance->traceLevel() >= 1) { @@ -444,38 +440,7 @@ IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& r } _closingInitiator = initiator; -#ifdef ICE_CPP11_MAPPING - if(reason) - { - try - { - rethrow_exception(reason); - } - catch(const Ice::CloseConnectionException&) - { - _closingReason = CLOSURE_NORMAL; - } - catch(const Ice::ObjectAdapterDeactivatedException&) - { - _closingReason = CLOSURE_SHUTDOWN; - } - catch(Ice::CommunicatorDestroyedException&) - { - _closingReason = CLOSURE_SHUTDOWN; - } - catch(const Ice::MemoryLimitException&) - { - _closingReason = CLOSURE_TOO_BIG; - } - catch(const Ice::ProtocolException&) - { - _closingReason = CLOSURE_PROTOCOL_ERROR; - } - catch(...) - { - } - } -#else + if(dynamic_cast<const Ice::CloseConnectionException*>(&reason)) { _closingReason = CLOSURE_NORMAL; @@ -493,7 +458,6 @@ IceInternal::WSTransceiver::closing(bool initiator, const Ice::LocalException& r { _closingReason = CLOSURE_TOO_BIG; } -#endif if(_state == StateOpened) { |