Revert "Reverted previous double-underscore changes in IceUtil classes"

This reverts commit 2e6243dd2955e6a292bbe8a569d4e1711253746a.

6 files changed, 18 insertions, 18 deletions

diff --git a/objective-c/src/Ice/Dispatcher.mm b/objective-c/src/Ice/Dispatcher.mm
index 33462e12fde..e71b84b38fb 100644
--- a/objective-c/src/Ice/Dispatcher.mm
+++ b/objective-c/src/Ice/Dispatcher.mm
@@ -85,12 +85,12 @@ typedef IceUtil::Handle<DispatcherI> DispatcherIPtr;
     }
 
     cxxCall_ = call;
-    cxxCall_->__incRef();
+    cxxCall_->iceIncRef();
     return self;
 }
 -(void) dealloc
 {
-    cxxCall_->__decRef();
+    cxxCall_->iceDecRef();
     cxxCall_ = 0;
     [super dealloc];
 }
diff --git a/objective-c/src/Ice/ImplicitContextI.mm b/objective-c/src/Ice/ImplicitContextI.mm
index 92b12edcf96..9bce79d6917 100644
--- a/objective-c/src/Ice/ImplicitContextI.mm
+++ b/objective-c/src/Ice/ImplicitContextI.mm
@@ -18,7 +18,7 @@
     if(self)
     {
         self->implicitContext__ = implicitContext;
-        self->implicitContext__->__incRef();
+        self->implicitContext__->iceIncRef();
     }
     return self;
 }
@@ -37,7 +37,7 @@
 
 -(void) dealloc
 {
-    self->implicitContext__->__decRef();
+    self->implicitContext__->iceDecRef();
     [super dealloc];
 }
 
diff --git a/objective-c/src/Ice/LocalObject.mm b/objective-c/src/Ice/LocalObject.mm
index 70b7dc692fa..0ccf9bc7dbf 100644
--- a/objective-c/src/Ice/LocalObject.mm
+++ b/objective-c/src/Ice/LocalObject.mm
@@ -43,7 +43,7 @@ std::map<IceUtil::Shared*, ICELocalObject*> cachedObjects;
         return nil;
     }
     cxxObject_ = arg;
-    CXXOBJECT->__incRef();
+    CXXOBJECT->iceIncRef();
 
     //
     // No synchronization because initWithCxxObject is always called with the wrapper class object locked
@@ -66,7 +66,7 @@ std::map<IceUtil::Shared*, ICELocalObject*> cachedObjects;
         // No synchronization because dealloc is always called with the wrapper class object locked
         //
         cachedObjects.erase(CXXOBJECT);
-        CXXOBJECT->__decRef();
+        CXXOBJECT->iceDecRef();
         cxxObject_ = 0;
     }
 
diff --git a/objective-c/src/Ice/Object.mm b/objective-c/src/Ice/Object.mm
index ba237c9ffb1..2093a2b8cdc 100644
--- a/objective-c/src/Ice/Object.mm
+++ b/objective-c/src/Ice/Object.mm
@@ -63,12 +63,12 @@ public:
 
     // We must explicitely CFRetain/CFRelease so that the garbage
     // collector does not trash the _object.
-    virtual void __incRef()
+    virtual void iceIncRef()
     {
         CFRetain(_object);
     }
 
-    virtual void __decRef()
+    virtual void iceDecRef()
     {
         CFRelease(_object);
     }
@@ -95,12 +95,12 @@ public:
 
     // We must explicitely CFRetain/CFRelease so that the garbage
     // collector does not trash the _blobject.
-    virtual void __incRef()
+    virtual void iceIncRef()
     {
         CFRetain(_blobject);
     }
 
-    virtual void __decRef()
+    virtual void iceDecRef()
     {
         CFRelease(_blobject);
     }
@@ -607,7 +607,7 @@ static NSString* ICEObject_all__[4] =
     }
 
     object__ = arg;
-    object__->__incRef();
+    object__->iceIncRef();
     assert(cachedObjects.find(object__) == cachedObjects.end());
     cachedObjects.insert(std::make_pair(object__, self));
     return self;
@@ -615,7 +615,7 @@ static NSString* ICEObject_all__[4] =
 -(void) dealloc
 {
     cachedObjects.erase(object__);
-    object__->__decRef();
+    object__->iceDecRef();
     [super dealloc];
 }
 +(id) servantWrapperWithCxxObject:(Ice::Object*)arg
diff --git a/objective-c/src/Ice/Proxy.mm b/objective-c/src/Ice/Proxy.mm
index 477d90a0f54..7ca6bf3ce7d 100644
--- a/objective-c/src/Ice/Proxy.mm
+++ b/objective-c/src/Ice/Proxy.mm
@@ -196,7 +196,7 @@ BOOL _returnsData;
     }
 
     asyncResult__ = arg.get();
-    ASYNCRESULT->__incRef();
+    ASYNCRESULT->iceIncRef();
     operation_ = [op retain];
     proxy_ = [p retain];
     return self;
@@ -209,7 +209,7 @@ BOOL _returnsData;
 
 -(void) dealloc
 {
-    ASYNCRESULT->__decRef();
+    ASYNCRESULT->iceDecRef();
     asyncResult__ = 0;
     [operation_ release];
     [proxy_ release];
@@ -322,7 +322,7 @@ BOOL _returnsData;
     }
     communicator__ = [ICECommunicator localObjectWithCxxObjectNoAutoRelease:arg->ice_getCommunicator().get()];
     objectPrx__ = arg.get();
-    OBJECTPRX->__incRef();
+    OBJECTPRX->iceIncRef();
     return self;
 }
 
@@ -333,7 +333,7 @@ BOOL _returnsData;
 
 -(void) dealloc
 {
-    OBJECTPRX->__decRef();
+    OBJECTPRX->iceDecRef();
     objectPrx__ = 0;
     [communicator__ release];
     [super dealloc];
diff --git a/objective-c/src/Ice/SlicedData.mm b/objective-c/src/Ice/SlicedData.mm
index f4c746141a2..4b3856e04c7 100644
--- a/objective-c/src/Ice/SlicedData.mm
+++ b/objective-c/src/Ice/SlicedData.mm
@@ -22,13 +22,13 @@
         return nil;
     }
     self->slicedData__ = slicedData;
-    self->slicedData__->__incRef();
+    self->slicedData__->iceIncRef();
     return self;
 }
 
 -(void) dealloc
 {
-    self->slicedData__->__decRef();
+    self->slicedData__->iceDecRef();
     [super dealloc];
 }