summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/AsyncResult.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/AsyncResult.cpp')
-rw-r--r--cpp/src/Ice/AsyncResult.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 42e58e945f7..60e5ac65773 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -24,9 +24,9 @@ AsyncResult::~AsyncResult()
}
void
-AsyncResult::iceCheck(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation)
+AsyncResult::__check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation)
{
- iceCheck(r, operation);
+ __check(r, operation);
if(r->getProxy().get() != prx)
{
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Proxy for call to end_" + operation +
@@ -36,9 +36,9 @@ AsyncResult::iceCheck(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx,
}
void
-AsyncResult::iceCheck(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation)
+AsyncResult::__check(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation)
{
- iceCheck(r, operation);
+ __check(r, operation);
if(r->getCommunicator().get() != com)
{
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Communicator for call to end_" + operation +
@@ -48,9 +48,9 @@ AsyncResult::iceCheck(const AsyncResultPtr& r, const Ice::Communicator* com, con
}
void
-AsyncResult::iceCheck(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation)
+AsyncResult::__check(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation)
{
- iceCheck(r, operation);
+ __check(r, operation);
if(r->getConnection().get() != con)
{
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Connection for call to end_" + operation +
@@ -60,7 +60,7 @@ AsyncResult::iceCheck(const AsyncResultPtr& r, const Ice::Connection* con, const
}
void
-AsyncResult::iceCheck(const AsyncResultPtr& r, const string& operation)
+AsyncResult::__check(const AsyncResultPtr& r, const string& operation)
{
if(!r)
{