From c8bd13216c537a811dc6b770b2d6631ed230ee2c Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Tue, 28 Oct 2014 15:02:03 +0100
Subject: Fixed ICE-5548: fixed C++11 support to maintain binary compatibility
 between C++11 and C++03 compiled code

---
 cpp/src/Ice/CommunicatorI.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index a7c2aee35d2..9a48b60d55b 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -221,11 +221,11 @@ Ice::CommunicatorI::begin_flushBatchRequests(const Callback_Communicator_flushBa
     return __begin_flushBatchRequests(cb, cookie);
 }
 
-#ifdef ICE_CPP11
 AsyncResultPtr
 Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (const Exception&)>& exception,
                                              const IceInternal::Function<void (bool)>& sent)
 {
+#ifdef ICE_CPP11
     class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
     {
 
@@ -256,8 +256,11 @@ Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (c
     };
 
     return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
-}
+#else
+    assert(false); // Ice not built with C++11 support.
+    return 0;
 #endif
+}
 
 namespace
 {
-- 
cgit v1.2.3