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/src/Ice/Exception.cpp | |
| 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/src/Ice/Exception.cpp')
| -rw-r--r-- | cpp/src/Ice/Exception.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 64fbfeb95bf..95136f5339a 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -106,7 +106,7 @@ throwMarshalException(const char* file, int line, const string& reason) namespace { -const string iceC_Ice_UserException_ids[] = +const string __Ice__UserException_ids[] = { "::Ice::UserException" }; @@ -116,7 +116,7 @@ const string iceC_Ice_UserException_ids[] = const std::string& Ice::UserException::ice_staticId() { - return iceC_Ice_UserException_ids[0]; + return __Ice__UserException_ids[0]; } #ifdef ICE_CPP11_MAPPING @@ -128,23 +128,23 @@ Ice::UserException::ice_clone() const #endif void -Ice::UserException::iceWrite(::Ice::OutputStream* os) const +Ice::UserException::__write(::Ice::OutputStream* os) const { os->startException(0); - iceWriteImpl(os); + __writeImpl(os); os->endException(); } void -Ice::UserException::iceRead(::Ice::InputStream* is) +Ice::UserException::__read(::Ice::InputStream* is) { is->startException(); - iceReadImpl(is); + __readImpl(is); is->endException(false); } bool -Ice::UserException::iceUsesClasses() const +Ice::UserException::__usesClasses() const { return false; } @@ -173,7 +173,7 @@ Ice::LocalException::ice_clone() const namespace { -const string iceC_Ice_LocalException_ids[] = +const string __Ice__LocalException_ids[] = { "::Ice::LocalException" }; @@ -183,7 +183,7 @@ const string iceC_Ice_LocalException_ids[] = const std::string& Ice::LocalException::ice_staticId() { - return iceC_Ice_LocalException_ids[0]; + return __Ice__LocalException_ids[0]; } Ice::SystemException::SystemException(const char* file, int line) : @@ -209,7 +209,7 @@ Ice::SystemException::ice_clone() const namespace { -const string iceC_Ice_SystemException_ids[] = +const string __Ice__SystemException_ids[] = { "::Ice::SystemException" }; @@ -219,7 +219,7 @@ const string iceC_Ice_SystemException_ids[] = const std::string& Ice::SystemException::ice_staticId() { - return iceC_Ice_SystemException_ids[0]; + return __Ice__SystemException_ids[0]; } void |