summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/AsyncResult.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-02 17:56:08 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-02 17:56:08 -0400
commit91fa99c34d1211d426b24bf68001fc27a87b3f00 (patch)
tree15af995f00414098b678b4cff09a9f0c29830fa8 /cpp/src/Ice/AsyncResult.cpp
parentAdd C# code sign support (diff)
downloadice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.bz2
ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.xz
ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.zip
Replaced double and triple underscores in C++ by ice-prefixed names
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 60e5ac65773..42e58e945f7 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -24,9 +24,9 @@ AsyncResult::~AsyncResult()
}
void
-AsyncResult::__check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation)
+AsyncResult::iceCheck(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation)
{
- __check(r, operation);
+ iceCheck(r, operation);
if(r->getProxy().get() != prx)
{
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Proxy for call to end_" + operation +
@@ -36,9 +36,9 @@ AsyncResult::__check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx,
}
void
-AsyncResult::__check(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation)
+AsyncResult::iceCheck(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation)
{
- __check(r, operation);
+ iceCheck(r, operation);
if(r->getCommunicator().get() != com)
{
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Communicator for call to end_" + operation +
@@ -48,9 +48,9 @@ AsyncResult::__check(const AsyncResultPtr& r, const Ice::Communicator* com, cons
}
void
-AsyncResult::__check(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation)
+AsyncResult::iceCheck(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation)
{
- __check(r, operation);
+ iceCheck(r, operation);
if(r->getConnection().get() != con)
{
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Connection for call to end_" + operation +
@@ -60,7 +60,7 @@ AsyncResult::__check(const AsyncResultPtr& r, const Ice::Connection* con, const
}
void
-AsyncResult::__check(const AsyncResultPtr& r, const string& operation)
+AsyncResult::iceCheck(const AsyncResultPtr& r, const string& operation)
{
if(!r)
{