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/ConnectionI.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/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index d75a0dd2222..82e1b48d6aa 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -624,11 +624,7 @@ Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, i // if(ICE_EXCEPTION_ISSET(_exception)) { -#ifdef ICE_CPP11_MAPPING - throw RetryException(_exception); -#else throw RetryException(*_exception.get()); -#endif } assert(_state > StateNotValidated); @@ -716,11 +712,7 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compres // if(ICE_EXCEPTION_ISSET(_exception)) { -#ifdef ICE_CPP11_MAPPING - throw RetryException(_exception); -#else throw RetryException(*_exception.get()); -#endif } assert(_state > StateNotValidated); assert(_state < StateClosing); @@ -2579,11 +2571,7 @@ Ice::ConnectionI::initiateShutdown() // // Notify the the transceiver of the graceful connection closure. // -#ifdef ICE_CPP11_MAPPING - SocketOperation op = _transceiver->closing(true, _exception); -#else SocketOperation op = _transceiver->closing(true, *_exception.get()); -#endif if(op) { scheduleTimeout(op); @@ -2929,11 +2917,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks) if(_state == StateClosing && _shutdownInitiated) { setState(StateClosingPending); -#ifdef ICE_CPP11_MAPPING - SocketOperation op = _transceiver->closing(true, _exception); -#else SocketOperation op = _transceiver->closing(true, *_exception.get()); -#endif if(op) { return op; @@ -3314,11 +3298,7 @@ Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& request // // Notify the the transceiver of the graceful connection closure. // -#ifdef ICE_CPP11_MAPPING - SocketOperation op = _transceiver->closing(false, _exception); -#else SocketOperation op = _transceiver->closing(false, *_exception.get()); -#endif if(op) { return op; |