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/Exception.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/Exception.h')
| -rw-r--r-- | cpp/include/Ice/Exception.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index b135e34c69b..b2b4720b8ea 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -57,10 +57,10 @@ class ICE_API UserException : public IceUtil::Exception { public: - virtual void iceWrite(::Ice::OutputStream*) const; - virtual void iceRead(::Ice::InputStream*); + virtual void __write(::Ice::OutputStream*) const; + virtual void __read(::Ice::InputStream*); - virtual bool iceUsesClasses() const; + virtual bool __usesClasses() const; #ifdef ICE_CPP11_MAPPING std::unique_ptr<UserException> ice_clone() const; @@ -72,8 +72,8 @@ public: protected: - virtual void iceWriteImpl(::Ice::OutputStream*) const {}; - virtual void iceReadImpl(::Ice::InputStream*) {}; + virtual void __writeImpl(::Ice::OutputStream*) const {}; + virtual void __readImpl(::Ice::InputStream*) {}; }; |