diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-07-25 16:19:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-07-25 16:19:49 -0400 |
| commit | 2747737921abaf666ec5b8eb2929c94ad0d19e05 (patch) | |
| tree | 7b665da082342e141eb0547d26ce713fa501bcb2 /cpp/src/Ice/BatchRequestQueue.cpp | |
| parent | Fix ICE-7250 - slice2cpp crash with optionals demo (diff) | |
| download | ice-2747737921abaf666ec5b8eb2929c94ad0d19e05.tar.bz2 ice-2747737921abaf666ec5b8eb2929c94ad0d19e05.tar.xz ice-2747737921abaf666ec5b8eb2929c94ad0d19e05.zip | |
Simplified exception-related code
Reduced VS 2015 U3 optimizer disabling
Diffstat (limited to 'cpp/src/Ice/BatchRequestQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/BatchRequestQueue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 53f5750836a..5eb2758b00e 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -91,9 +91,9 @@ void BatchRequestQueue::prepareBatchRequest(OutputStream* os) { Lock sync(*this); - if(ICE_EXCEPTION_ISSET(_exception)) + if(_exception) { - ICE_RETHROW_EXCEPTION(_exception); + _exception->ice_throw(); } waitStreamInUse(false); _batchStreamInUse = true; |