diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-02 17:56:08 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-02 17:56:08 -0400 |
| commit | 91fa99c34d1211d426b24bf68001fc27a87b3f00 (patch) | |
| tree | 15af995f00414098b678b4cff09a9f0c29830fa8 /cpp/include/Ice/ConnectionAsync.h | |
| parent | Add C# code sign support (diff) | |
| download | ice-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/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 ce9fd85e7af..dfba4900e52 100644 --- a/cpp/include/Ice/ConnectionAsync.h +++ b/cpp/include/Ice/ConnectionAsync.h @@ -34,18 +34,18 @@ public: { } - virtual void completed(const ::Ice::AsyncResultPtr& __result) const + virtual void completed(const ::Ice::AsyncResultPtr& iceResult) const { - ::Ice::ConnectionPtr __con = __result->getConnection(); - assert(__con); + ::Ice::ConnectionPtr iceCon = iceResult->getConnection(); + assert(iceCon); try { - __con->end_flushBatchRequests(__result); + iceCon->end_flushBatchRequests(iceResult); assert(false); } catch(const ::Ice::Exception& ex) { - ::IceInternal::CallbackNC<T>::exception(__result, ex); + ::IceInternal::CallbackNC<T>::exception(iceResult, ex); } } }; @@ -81,18 +81,18 @@ public: { } - virtual void completed(const ::Ice::AsyncResultPtr& __result) const + virtual void completed(const ::Ice::AsyncResultPtr& iceResult) const { - ::Ice::ConnectionPtr __con = __result->getConnection(); - assert(__con); + ::Ice::ConnectionPtr iceCon = iceResult->getConnection(); + assert(iceCon); try { - __con->end_flushBatchRequests(__result); + iceCon->end_flushBatchRequests(iceResult); assert(false); } catch(const ::Ice::Exception& ex) { - ::IceInternal::Callback<T, CT>::exception(__result, ex); + ::IceInternal::Callback<T, CT>::exception(iceResult, ex); } } }; |