From 0593db2ff6438f0c259144822c6f0ada1f7b79df Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Tue, 23 May 2017 18:47:34 +0200
Subject: Fixed ICE-7884 - TwowayOnlyException is now raised for twoway
 invocations on oneway proxies

---
 cpp/src/Glacier2Lib/SessionHelper.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'cpp/src/Glacier2Lib/SessionHelper.cpp')

diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 3891e31ab7f..b5d436c7503 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1041,7 +1041,11 @@ Glacier2::SessionFactoryHelper::setProtocol(const string& protocol)
        protocol != "ws" &&
        protocol != "wss")
     {
+#ifdef ICE_CPP11_MAPPING
+        throw invalid_argument("Unknown protocol `" + protocol + "'");
+#else
         throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Unknown protocol `" + protocol + "'");
+#endif
     }
     _protocol = protocol;
 }
-- 
cgit v1.2.3