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/ProxyHandle.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/ProxyHandle.h')
| -rw-r--r-- | cpp/include/Ice/ProxyHandle.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h index 0e39dfa9ef6..628fb2b460b 100644 --- a/cpp/include/Ice/ProxyHandle.h +++ b/cpp/include/Ice/ProxyHandle.h @@ -125,7 +125,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -136,7 +136,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -147,7 +147,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -157,7 +157,7 @@ public: if(this->_ptr) { - upCast(this->_ptr)->iceIncRef(); + upCast(this->_ptr)->__incRef(); } } @@ -165,7 +165,7 @@ public: { if(this->_ptr) { - upCast(this->_ptr)->iceDecRef(); + upCast(this->_ptr)->__decRef(); } } @@ -175,12 +175,12 @@ public: { if(p) { - upCast(p)->iceIncRef(); + upCast(p)->__incRef(); } if(this->_ptr) { - upCast(this->_ptr)->iceDecRef(); + upCast(this->_ptr)->__decRef(); } this->_ptr = p; @@ -195,12 +195,12 @@ public: { if(r._ptr) { - upCast(r._ptr)->iceIncRef(); + upCast(r._ptr)->__incRef(); } if(this->_ptr) { - upCast(this->_ptr)->iceDecRef(); + upCast(this->_ptr)->__decRef(); } this->_ptr = r._ptr; @@ -215,12 +215,12 @@ public: { if(r._ptr) { - upCast(r._ptr)->iceIncRef(); + upCast(r._ptr)->__incRef(); } if(this->_ptr) { - upCast(this->_ptr)->iceDecRef(); + upCast(this->_ptr)->__decRef(); } this->_ptr = r._ptr; @@ -234,12 +234,12 @@ public: { if(r._ptr) { - upCast(r._ptr)->iceIncRef(); + upCast(r._ptr)->__incRef(); } if(this->_ptr) { - upCast(this->_ptr)->iceDecRef(); + upCast(this->_ptr)->__decRef(); } this->_ptr = r._ptr; @@ -247,7 +247,7 @@ public: return *this; } - ::IceProxy::Ice::Object* iceUpCast() const + ::IceProxy::Ice::Object* __upCast() const { return upCast(this->_ptr); } |