- bug 3533: add async version of Connection/Communicator

  flushBatchRequests operation
- Slice file cleanup in C# tests
- Updating C++ dependencies

1 files changed, 3 insertions, 4 deletions

diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 96df0c720ac..8af65362363 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1129,14 +1129,13 @@ IceProxy::Ice::Object::ice_flushBatchRequests_async(const AMI_Object_ice_flushBa
     {
         __del = newCallback_Object_ice_flushBatchRequests(cb, &AMI_Object_ice_flushBatchRequests::__exception);
     }
-    ::Ice::AsyncResultPtr result = begin_ice_flushBatchRequests(0, __del, 0);
+    ::Ice::AsyncResultPtr result = begin_ice_flushBatchRequestsInternal(__del, 0);
     return result->sentSynchronously();
 }
 
 ::Ice::AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_flushBatchRequests(const ::Ice::Context* /* unused */,
-                                                    const ::IceInternal::CallbackBasePtr& del,
-                                                    const ::Ice::LocalObjectPtr& cookie)
+IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
+                                                            const ::Ice::LocalObjectPtr& cookie)
 {
     ::IceInternal::ProxyBatchOutgoingAsyncPtr __result = 
         new ::IceInternal::ProxyBatchOutgoingAsync(this, ice_flushBatchRequests_name, del, cookie);