summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/Shared.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-05 10:51:35 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-05 10:51:35 -0400
commit298bccf0b6243f2cd741af59b1547b915128356b (patch)
treeaff10041d00b5aec3413e620db079cc735c83375 /cpp/src/IceUtil/Shared.cpp
parentRevert "Replaced double underscores in C# mapping by ice-prefix names" (diff)
downloadice-298bccf0b6243f2cd741af59b1547b915128356b.tar.bz2
ice-298bccf0b6243f2cd741af59b1547b915128356b.tar.xz
ice-298bccf0b6243f2cd741af59b1547b915128356b.zip
Revert "Reverted previous double-underscore changes in IceUtil classes"
This reverts commit 2e6243dd2955e6a292bbe8a569d4e1711253746a.
Diffstat (limited to 'cpp/src/IceUtil/Shared.cpp')
-rw-r--r--cpp/src/IceUtil/Shared.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 75b43462398..c9c924fef27 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::__incRef()
+IceUtil::Shared::iceIncRef()
{
assert(_ref >= 0);
++_ref;
}
void
-IceUtil::Shared::__decRef()
+IceUtil::Shared::iceDecRef()
{
assert(_ref > 0);
if(--_ref == 0 && !(_flags & NoDelete))
@@ -64,13 +64,13 @@ IceUtil::Shared::__decRef()
}
int
-IceUtil::Shared::__getRef() const
+IceUtil::Shared::iceGetRef() const
{
return _ref;
}
void
-IceUtil::Shared::__setNoDelete(bool b)
+IceUtil::Shared::iceSetNoDelete(bool b)
{
_flags = b ? (_flags | NoDelete) : (_flags & ~NoDelete);
}