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/AsyncResult.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/AsyncResult.h')
| -rw-r--r-- | cpp/include/Ice/AsyncResult.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h index 5562448e7eb..e8aea029007 100644 --- a/cpp/include/Ice/AsyncResult.h +++ b/cpp/include/Ice/AsyncResult.h @@ -51,20 +51,20 @@ public: virtual const std::string& getOperation() const = 0; - virtual bool iceWait() = 0; - virtual Ice::InputStream* iceStartReadParams() = 0; - virtual void iceEndReadParams() = 0; - virtual void iceReadEmptyParams() = 0; - virtual void iceReadParamEncaps(const ::Ice::Byte*&, ::Ice::Int&) = 0; - virtual void iceThrowUserException() = 0; + virtual bool __wait() = 0; + virtual Ice::InputStream* __startReadParams() = 0; + virtual void __endReadParams() = 0; + virtual void __readEmptyParams() = 0; + virtual void __readParamEncaps(const ::Ice::Byte*&, ::Ice::Int&) = 0; + virtual void __throwUserException() = 0; - static void iceCheck(const AsyncResultPtr&, const ::IceProxy::Ice::Object*, const ::std::string&); - static void iceCheck(const AsyncResultPtr&, const Connection*, const ::std::string&); - static void iceCheck(const AsyncResultPtr&, const Communicator*, const ::std::string&); + static void __check(const AsyncResultPtr&, const ::IceProxy::Ice::Object*, const ::std::string&); + static void __check(const AsyncResultPtr&, const Connection*, const ::std::string&); + static void __check(const AsyncResultPtr&, const Communicator*, const ::std::string&); protected: - static void iceCheck(const AsyncResultPtr&, const ::std::string&); + static void __check(const AsyncResultPtr&, const ::std::string&); }; } |