summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/GCObject.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
commita9207c4a7e8190cb64286afc1b373f16010d0feb (patch)
treeb6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/include/Ice/GCObject.h
parentRevert "Reverted previous double-underscore changes in IceUtil classes" (diff)
downloadice-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/GCObject.h')
-rw-r--r--cpp/include/Ice/GCObject.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index ad18de931ca..e115795be20 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -47,24 +47,24 @@ public:
//
// Override IceUtil::Shared methods
//
- virtual void iceIncRef();
- virtual void iceDecRef();
- virtual int iceGetRef() const;
- virtual void iceSetNoDelete(bool);
+ virtual void __incRef();
+ virtual void __decRef();
+ virtual int __getRef() const;
+ virtual void __setNoDelete(bool);
//
// Override Object methods
//
- virtual bool iceGcVisit(GCVisitor&);
+ virtual bool __gcVisit(GCVisitor&);
virtual void ice_collectable(bool);
//
// This method is implemented by Slice classes to visit class
// members.
//
- virtual void iceGcVisitMembers(IceInternal::GCVisitor&) = 0;
+ virtual void __gcVisitMembers(IceInternal::GCVisitor&) = 0;
- int iceGetRefUnsafe()
+ int __getRefUnsafe()
{
return _ref;
}