Merge remote-tracking branch 'origin/encoding11' into mx

Conflicts:
	cpp/config/Make.rules.Darwin
	cpp/src/Ice/ConnectionFactory.cpp
	cpp/src/Ice/ConnectionI.h

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index a54c8bfb9b0..25762041b06 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -310,20 +310,20 @@ Ice::CommunicatorI::flushBatchRequests()
 AsyncResultPtr
 Ice::CommunicatorI::begin_flushBatchRequests()
 {
-    return begin_flushBatchRequestsInternal(::IceInternal::__dummyCallback, 0);
+    return __begin_flushBatchRequests(::IceInternal::__dummyCallback, 0);
 }
 
 AsyncResultPtr
 Ice::CommunicatorI::begin_flushBatchRequests(const CallbackPtr& cb, const LocalObjectPtr& cookie)
 {
-    return begin_flushBatchRequestsInternal(cb, cookie);
+    return __begin_flushBatchRequests(cb, cookie);
 }
 
 AsyncResultPtr
 Ice::CommunicatorI::begin_flushBatchRequests(const Callback_Communicator_flushBatchRequestsPtr& cb,
                                              const LocalObjectPtr& cookie)
 {
-    return begin_flushBatchRequestsInternal(cb, cookie);
+    return __begin_flushBatchRequests(cb, cookie);
 }
 
 namespace
@@ -334,7 +334,7 @@ const ::std::string __flushBatchRequests_name = "flushBatchRequests";
 }
 
 AsyncResultPtr
-Ice::CommunicatorI::begin_flushBatchRequestsInternal(const IceInternal::CallbackBasePtr& cb,
+Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePtr& cb,
                                                      const LocalObjectPtr& cookie)
 {
     OutgoingConnectionFactoryPtr connectionFactory = _instance->outgoingConnectionFactory();