From 55527152af356fda6037f836c978c2b3a2e2f045 Mon Sep 17 00:00:00 2001 From: Mark Spruiell Date: Tue, 8 Dec 2009 14:10:38 -0800 Subject: - bug 3533: add async version of Connection/Communicator flushBatchRequests operation - Slice file cleanup in C# tests - Updating C++ dependencies --- cpp/src/Ice/ObjectAdapterFactory.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cpp/src/Ice/ObjectAdapterFactory.cpp') diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp index a8345745fee..83161252ab5 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.cpp +++ b/cpp/src/Ice/ObjectAdapterFactory.cpp @@ -197,7 +197,7 @@ IceInternal::ObjectAdapterFactory::removeObjectAdapter(const ObjectAdapterPtr& a } void -IceInternal::ObjectAdapterFactory::flushBatchRequests() const +IceInternal::ObjectAdapterFactory::flushAsyncBatchRequests(const CommunicatorBatchOutgoingAsyncPtr& outAsync) const { list adapters; { @@ -205,7 +205,11 @@ IceInternal::ObjectAdapterFactory::flushBatchRequests() const adapters = _adapters; } - for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapterI::flushBatchRequests)); + + for(list::const_iterator p = adapters.begin(); p != adapters.end(); ++p) + { + (*p)->flushAsyncBatchRequests(outAsync); + } } IceInternal::ObjectAdapterFactory::ObjectAdapterFactory(const InstancePtr& instance, -- cgit v1.2.3