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/IceUtil | |
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/IceUtil')
-rw-r--r-- | cpp/src/IceUtil/Shared.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp index c9c924fef27..75b43462398 100644 --- a/cpp/src/IceUtil/Shared.cpp +++ b/cpp/src/IceUtil/Shared.cpp @@ -47,14 +47,14 @@ IceUtil::Shared::Shared(const Shared&) : } void -IceUtil::Shared::iceIncRef() +IceUtil::Shared::__incRef() { assert(_ref >= 0); ++_ref; } void -IceUtil::Shared::iceDecRef() +IceUtil::Shared::__decRef() { assert(_ref > 0); if(--_ref == 0 && !(_flags & NoDelete)) @@ -64,13 +64,13 @@ IceUtil::Shared::iceDecRef() } int -IceUtil::Shared::iceGetRef() const +IceUtil::Shared::__getRef() const { return _ref; } void -IceUtil::Shared::iceSetNoDelete(bool b) +IceUtil::Shared::__setNoDelete(bool b) { _flags = b ? (_flags | NoDelete) : (_flags & ~NoDelete); } |