From 2747737921abaf666ec5b8eb2929c94ad0d19e05 Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Mon, 25 Jul 2016 16:19:49 -0400
Subject: Simplified exception-related code Reduced VS 2015 U3 optimizer
 disabling

---
 cpp/src/Ice/BatchRequestQueue.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpp/src/Ice/BatchRequestQueue.cpp')

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;
-- 
cgit v1.2.3