Completed fix for ICE-5567: move various C++11 classes/functions out of line

1 files changed, 39 insertions, 0 deletions

diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 2af374c1fb5..8bc80d47363 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -222,6 +222,45 @@ 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)
+{
+    class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
+    {
+
+    public:
+    
+        Cpp11CB(const IceInternal::Function<void (const Exception&)>& excb,
+                const IceInternal::Function<void (bool)>& sentcb) :
+            IceInternal::Cpp11FnCallbackNC(excb, sentcb)
+        {
+            CallbackBase::checkCallback(true, excb != nullptr);
+        }
+        
+        virtual void
+        __completed(const AsyncResultPtr& __result) const
+        {
+            CommunicatorPtr __com = __result->getCommunicator();
+            assert(__com);
+            try
+            {
+                __com->end_flushBatchRequests(__result);
+                assert(false);
+            }
+            catch(const Exception& ex)
+            {
+                IceInternal::Cpp11FnCallbackNC::__exception(__result, ex);
+            }
+        }
+    };
+
+    return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
+}
+#endif
+
 namespace
 {