diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:35 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:35 -0400 |
| commit | 298bccf0b6243f2cd741af59b1547b915128356b (patch) | |
| tree | aff10041d00b5aec3413e620db079cc735c83375 /cpp/include/Ice/GCObject.h | |
| parent | Revert "Replaced double underscores in C# mapping by ice-prefix names" (diff) | |
| download | ice-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/include/Ice/GCObject.h')
| -rw-r--r-- | cpp/include/Ice/GCObject.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h index 0c1afc028e3..ad18de931ca 100644 --- a/cpp/include/Ice/GCObject.h +++ b/cpp/include/Ice/GCObject.h @@ -47,10 +47,10 @@ public: // // Override IceUtil::Shared methods // - virtual void __incRef(); - virtual void __decRef(); - virtual int __getRef() const; - virtual void __setNoDelete(bool); + virtual void iceIncRef(); + virtual void iceDecRef(); + virtual int iceGetRef() const; + virtual void iceSetNoDelete(bool); // // Override Object methods @@ -64,7 +64,7 @@ public: // virtual void iceGcVisitMembers(IceInternal::GCVisitor&) = 0; - int __getRefUnsafe() + int iceGetRefUnsafe() { return _ref; } |