summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.h
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-08-13 16:10:07 +0200
committerJose <jose@zeroc.com>2012-08-13 16:10:07 +0200
commit1f568535af1dfc1619dfd0b5a74d58c29ed3af8b (patch)
treef60a79dbad94af1c40a258786b65e16dd294c8c7 /cpp/src/Ice/ConnectionI.h
parentRemoved another disable VC++ disable warning from IceUtil/Config.h (diff)
downloadice-1f568535af1dfc1619dfd0b5a74d58c29ed3af8b.tar.bz2
ice-1f568535af1dfc1619dfd0b5a74d58c29ed3af8b.tar.xz
ice-1f568535af1dfc1619dfd0b5a74d58c29ed3af8b.zip
c++11 minor method renaming
Diffstat (limited to 'cpp/src/Ice/ConnectionI.h')
-rw-r--r--cpp/src/Ice/ConnectionI.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index 946a24f0c79..68f82317893 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -110,7 +110,7 @@ public:
const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
{
- return begin_flushBatchRequestsInternal(new Cpp11FnCallbackNC_Connection_flushBatchRequests(exception, sent), 0);
+ return __begin_flushBatchRequests(new Cpp11FnCallbackNC_Connection_flushBatchRequests(exception, sent), 0);
}
#endif
@@ -276,7 +276,7 @@ private:
int connectTimeout();
int closeTimeout();
- AsyncResultPtr begin_flushBatchRequestsInternal(const IceInternal::CallbackBasePtr&, const LocalObjectPtr&);
+ AsyncResultPtr __begin_flushBatchRequests(const IceInternal::CallbackBasePtr&, const LocalObjectPtr&);
Ice::CommunicatorPtr _communicator;
const IceInternal::InstancePtr _instance;