diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-14 08:17:43 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-14 08:17:43 +0200 |
| commit | 17437950dd181520d5931b3f7d22d2c304b28b9a (patch) | |
| tree | 3bcc9c7df9a8d4cadca16bbe6dcd42d2f960d2cc /cpp/src | |
| parent | ICE-7167 - javadoc fixes (diff) | |
| download | ice-17437950dd181520d5931b3f7d22d2c304b28b9a.tar.bz2 ice-17437950dd181520d5931b3f7d22d2c304b28b9a.tar.xz ice-17437950dd181520d5931b3f7d22d2c304b28b9a.zip | |
Fixed ICE-8048 - removed double underscores that crept back in
Diffstat (limited to 'cpp/src')
| -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 46921ad21e2..dbd92516cad 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -897,7 +897,7 @@ Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r) namespace { -const ::std::string __heartbeat_name = "heartbeat"; +const ::std::string heartbeat_name = "heartbeat"; class HeartbeatAsync : public OutgoingAsyncBase { @@ -924,12 +924,12 @@ public: virtual const string& getOperation() const { - return __heartbeat_name; + return heartbeat_name; } void invoke() { - _observer.attach(_instance.get(), __heartbeat_name); + _observer.attach(_instance.get(), heartbeat_name); try { _os.write(magic[0]); @@ -1057,7 +1057,7 @@ Ice::ConnectionI::_iceI_begin_heartbeat(const CallbackBasePtr& cb, const LocalOb void Ice::ConnectionI::end_heartbeat(const AsyncResultPtr& r) { - AsyncResult::_check(r, this, __heartbeat_name); + AsyncResult::_check(r, this, heartbeat_name); r->_waitForResponse(); } #endif |