diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-02-03 10:42:29 +0100 |
| commit | 18a6720fcc3ece576f5fb26283e239cda2bebadd (patch) | |
| tree | a7d9de0acab9e092943fb182fa880b2c4b950db6 /cpp/src/Ice/Outgoing.cpp | |
| parent | ICE-6861 - Java stream API changes (diff) | |
| download | ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.bz2 ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.tar.xz ice-18a6720fcc3ece576f5fb26283e239cda2bebadd.zip | |
Refactored invocation code to better suite new C++11 mapping
Diffstat (limited to 'cpp/src/Ice/Outgoing.cpp')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index acd1a5e829e..060b6782ae3 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -206,7 +206,7 @@ ProxyOutgoingBase::invokeImpl() } } - if(ICE_EXCEPTION_GET(_exception)) + if(ICE_EXCEPTION_ISSET(_exception)) { ICE_RETHROW_EXCEPTION(_exception); } @@ -644,11 +644,11 @@ ConnectionFlushBatch::invoke() else if(!_connection->sendRequest(this, false, false, batchRequestNum)) { Monitor<Mutex>::Lock sync(_monitor); - while(!ICE_EXCEPTION_GET(_exception) && !_sent) + while(!ICE_EXCEPTION_ISSET(_exception) && !_sent) { _monitor.wait(); } - if(ICE_EXCEPTION_GET(_exception)) + if(ICE_EXCEPTION_ISSET(_exception)) { ICE_RETHROW_EXCEPTION(_exception); } |