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/ConnectionI.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/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 46b276647c0..2eb66ff7d0a 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -890,8 +890,8 @@ Ice::ConnectionI::_iceI_begin_flushBatchRequests(CompressBatch compress, void Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r) { - AsyncResult::check(r, this, flushBatchRequests_name); - r->waitForResponse(); + AsyncResult::_check(r, this, flushBatchRequests_name); + r->_waitForResponse(); } #endif @@ -1058,8 +1058,8 @@ Ice::ConnectionI::_iceI_begin_heartbeat(const CallbackBasePtr& cb, const LocalOb void Ice::ConnectionI::end_heartbeat(const AsyncResultPtr& r) { - AsyncResult::check(r, this, __heartbeat_name); - r->waitForResponse(); + AsyncResult::_check(r, this, __heartbeat_name); + r->_waitForResponse(); } #endif |