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/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index d9588b62e89..01f18e6e91f 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -983,6 +983,45 @@ Ice::ConnectionI::begin_flushBatchRequests(const Callback_Connection_flushBatchR
     return __begin_flushBatchRequests(cb, cookie);
 }
 
+#ifdef ICE_CPP11
+AsyncResultPtr 
+Ice::ConnectionI::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
+        {
+            ConnectionPtr __con = __result->getConnection();
+            assert(__con);
+            try
+            {
+                __con->end_flushBatchRequests(__result);
+                assert(false);
+            }
+            catch(const Exception& ex)
+            {
+                IceInternal::Cpp11FnCallbackNC::__exception(__result, ex);
+            }
+        }
+    };
+    
+    return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
+}
+#endif
+
 AsyncResultPtr
 Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
 {