diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-01 09:26:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-01 09:26:44 +0200 |
| commit | 19077d22e78f93212445c6969045e736b4a466d7 (patch) | |
| tree | 484d4b0dc9a791c9f8f0c4b3dbf212856aba1f55 /cpp/src/Ice/AsyncResult.cpp | |
| parent | Updated recursive mutex check (diff) | |
| download | ice-19077d22e78f93212445c6969045e736b4a466d7.tar.bz2 ice-19077d22e78f93212445c6969045e736b4a466d7.tar.xz ice-19077d22e78f93212445c6969045e736b4a466d7.zip | |
Fixed ICE-7941 - scheduleCallback now provides the connection to the dispatcher work item, fixed naming of AsyncResult private methods
Diffstat (limited to 'cpp/src/Ice/AsyncResult.cpp')
| -rw-r--r-- | cpp/src/Ice/AsyncResult.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp index 6d6826e755c..7cc69b86dce 100644 --- a/cpp/src/Ice/AsyncResult.cpp +++ b/cpp/src/Ice/AsyncResult.cpp @@ -24,7 +24,7 @@ AsyncResult::~AsyncResult() } void -AsyncResult::check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation) +AsyncResult::_check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, const string& operation) { check(r, operation); if(r->getProxy().get() != prx) @@ -36,7 +36,7 @@ AsyncResult::check(const AsyncResultPtr& r, const IceProxy::Ice::Object* prx, co } void -AsyncResult::check(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation) +AsyncResult::_check(const AsyncResultPtr& r, const Ice::Communicator* com, const string& operation) { check(r, operation); if(r->getCommunicator().get() != com) @@ -48,7 +48,7 @@ AsyncResult::check(const AsyncResultPtr& r, const Ice::Communicator* com, const } void -AsyncResult::check(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation) +AsyncResult::_check(const AsyncResultPtr& r, const Ice::Connection* con, const string& operation) { check(r, operation); if(r->getConnection().get() != con) |