diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
| commit | a9207c4a7e8190cb64286afc1b373f16010d0feb (patch) | |
| tree | b6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/include/Ice/ConnectionAsync.h | |
| parent | Revert "Reverted previous double-underscore changes in IceUtil classes" (diff) | |
| download | ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2 ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip | |
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'cpp/include/Ice/ConnectionAsync.h')
| -rw-r--r-- | cpp/include/Ice/ConnectionAsync.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h index dfba4900e52..ce9fd85e7af 100644 --- a/cpp/include/Ice/ConnectionAsync.h +++ b/cpp/include/Ice/ConnectionAsync.h @@ -34,18 +34,18 @@ public: { } - virtual void completed(const ::Ice::AsyncResultPtr& iceResult) const + virtual void completed(const ::Ice::AsyncResultPtr& __result) const { - ::Ice::ConnectionPtr iceCon = iceResult->getConnection(); - assert(iceCon); + ::Ice::ConnectionPtr __con = __result->getConnection(); + assert(__con); try { - iceCon->end_flushBatchRequests(iceResult); + __con->end_flushBatchRequests(__result); assert(false); } catch(const ::Ice::Exception& ex) { - ::IceInternal::CallbackNC<T>::exception(iceResult, ex); + ::IceInternal::CallbackNC<T>::exception(__result, ex); } } }; @@ -81,18 +81,18 @@ public: { } - virtual void completed(const ::Ice::AsyncResultPtr& iceResult) const + virtual void completed(const ::Ice::AsyncResultPtr& __result) const { - ::Ice::ConnectionPtr iceCon = iceResult->getConnection(); - assert(iceCon); + ::Ice::ConnectionPtr __con = __result->getConnection(); + assert(__con); try { - iceCon->end_flushBatchRequests(iceResult); + __con->end_flushBatchRequests(__result); assert(false); } catch(const ::Ice::Exception& ex) { - ::IceInternal::Callback<T, CT>::exception(iceResult, ex); + ::IceInternal::Callback<T, CT>::exception(__result, ex); } } }; |