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/include/Ice/Handle.h | |
| 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/include/Ice/Handle.h')
| -rw-r--r-- | cpp/include/Ice/Handle.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h index 927ad362b13..59283f07702 100644 --- a/cpp/include/Ice/Handle.h +++ b/cpp/include/Ice/Handle.h @@ -43,7 +43,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -54,7 +54,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -65,7 +65,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -75,7 +75,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -83,7 +83,7 @@ public: { if(this->_ptr) { - upCast(this->_ptr)->iceDecRef(); + upCast(this->_ptr)->__decRef(); } } @@ -93,7 +93,7 @@ public: { if(p) { - upCast(p)->iceIncRef(); + upCast(p)->__incRef(); } T* ptr = this->_ptr; @@ -101,7 +101,7 @@ public: if(ptr) { - upCast(ptr)->iceDecRef(); + upCast(ptr)->__decRef(); } } return *this; @@ -114,7 +114,7 @@ public: { if(r._ptr) { - upCast(r._ptr)->iceIncRef(); + upCast(r._ptr)->__incRef(); } T* ptr = this->_ptr; @@ -122,7 +122,7 @@ public: if(ptr) { - upCast(ptr)->iceDecRef(); + upCast(ptr)->__decRef(); } } return *this; @@ -135,7 +135,7 @@ public: { if(r._ptr) { - upCast(r._ptr)->iceIncRef(); + upCast(r._ptr)->__incRef(); } T* ptr = this->_ptr; @@ -143,7 +143,7 @@ public: if(ptr) { - upCast(ptr)->iceDecRef(); + upCast(ptr)->__decRef(); } } return *this; @@ -155,7 +155,7 @@ public: { if(r._ptr) { - upCast(r._ptr)->iceIncRef(); + upCast(r._ptr)->__incRef(); } T* ptr = this->_ptr; @@ -163,7 +163,7 @@ public: if(ptr) { - upCast(ptr)->iceDecRef(); + upCast(ptr)->__decRef(); } } return *this; @@ -181,7 +181,7 @@ public: return Handle(dynamic_cast<T*>(p)); } - void iceClearHandleUnsafe() + void __clearHandleUnsafe() { this->_ptr = 0; } |