summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectionI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
-rw-r--r--cpp/src/Ice/ConnectionI.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index afc70dcf85f..fb38a16bc8a 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -924,7 +924,7 @@ Ice::ConnectionI::flushBatchRequests()
AsyncResultPtr
Ice::ConnectionI::begin_flushBatchRequests()
{
- return begin_flushBatchRequestsInternal(__dummyCallback, 0);
+ return __begin_flushBatchRequests(__dummyCallback, 0);
}
namespace
@@ -937,18 +937,18 @@ const ::std::string __flushBatchRequests_name = "flushBatchRequests";
AsyncResultPtr
Ice::ConnectionI::begin_flushBatchRequests(const CallbackPtr& cb, const LocalObjectPtr& cookie)
{
- return begin_flushBatchRequestsInternal(cb, cookie);
+ return __begin_flushBatchRequests(cb, cookie);
}
AsyncResultPtr
Ice::ConnectionI::begin_flushBatchRequests(const Callback_Connection_flushBatchRequestsPtr& cb,
const LocalObjectPtr& cookie)
{
- return begin_flushBatchRequestsInternal(cb, cookie);
+ return __begin_flushBatchRequests(cb, cookie);
}
AsyncResultPtr
-Ice::ConnectionI::begin_flushBatchRequestsInternal(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
+Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
{
ConnectionBatchOutgoingAsyncPtr result =
new ConnectionBatchOutgoingAsync(this, _communicator, _instance, __flushBatchRequests_name, cb, cookie);
@@ -2018,7 +2018,7 @@ Ice::ConnectionI::setState(State state, const LocalException& ex)
//
assert(_state != StateClosed);
- _exception.reset(dynamic_cast<LocalException*>(ex.ice_clone()));
+ _exception.reset(ex.ice_clone());
if(_warn)
{