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

1 files changed, 2 insertions, 32 deletions

diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index 7d049d4755b..4275bdf9aa8 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -41,43 +41,13 @@ public:
             __con->end_flushBatchRequests(__result);
             assert(false);
         }
-        catch(::Ice::Exception& ex)
+        catch(const ::Ice::Exception& ex)
         {
             ::IceInternal::CallbackNC<T>::__exception(__result, ex);
         }
     }
 };
 
-#ifdef ICE_CPP11
-class Cpp11FnCallbackNC_Connection_flushBatchRequests : virtual public ::IceInternal::Cpp11FnCallbackNC
-{
-public:
-    
-    Cpp11FnCallbackNC_Connection_flushBatchRequests(const ::IceInternal::Function<void (const ::Ice::Exception&)>& excb,
-                            const ::IceInternal::Function<void (bool)>& sentcb) :
-        ::IceInternal::Cpp11FnCallbackNC(excb, sentcb)
-    {
-        CallbackBase::checkCallback(true, excb != nullptr);
-    }
-    
-    virtual void
-    __completed(const ::Ice::AsyncResultPtr& __result) const
-    {
-        ::Ice::ConnectionPtr __con = __result->getConnection();
-        assert(__con);
-        try
-        {
-            __con->end_flushBatchRequests(__result);
-            assert(false);
-        }
-        catch(::Ice::Exception& ex)
-        {
-            ::IceInternal::Cpp11FnCallbackNC::__exception(__result, ex);
-        }
-    }
-};
-#endif
-
 template<class T> Callback_Connection_flushBatchRequestsPtr
 newCallback_Connection_flushBatchRequests(const IceUtil::Handle<T>& instance,
                                           void (T::*excb)(const ::Ice::Exception&),
@@ -118,7 +88,7 @@ public:
             __con->end_flushBatchRequests(__result);
             assert(false);
         }
-        catch(::Ice::Exception& ex)
+        catch(const ::Ice::Exception& ex)
         {
             ::IceInternal::Callback<T, CT>::__exception(__result, ex);
         }