Revert "Replaced double and triple underscores in C++ by ice-prefixed names"

This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.

8 files changed, 39 insertions, 39 deletions

diff --git a/objective-c/src/Ice/Dispatcher.mm b/objective-c/src/Ice/Dispatcher.mm
index e71b84b38fb..33462e12fde 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_->iceIncRef();
+    cxxCall_->__incRef();
     return self;
 }
 -(void) dealloc
 {
-    cxxCall_->iceDecRef();
+    cxxCall_->__decRef();
     cxxCall_ = 0;
     [super dealloc];
 }
diff --git a/objective-c/src/Ice/ImplicitContextI.mm b/objective-c/src/Ice/ImplicitContextI.mm
index 9bce79d6917..92b12edcf96 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__->iceIncRef();
+        self->implicitContext__->__incRef();
     }
     return self;
 }
@@ -37,7 +37,7 @@
 
 -(void) dealloc
 {
-    self->implicitContext__->iceDecRef();
+    self->implicitContext__->__decRef();
     [super dealloc];
 }
 
diff --git a/objective-c/src/Ice/LocalObject.mm b/objective-c/src/Ice/LocalObject.mm
index 0ccf9bc7dbf..70b7dc692fa 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->iceIncRef();
+    CXXOBJECT->__incRef();
 
     //
     // 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->iceDecRef();
+        CXXOBJECT->__decRef();
         cxxObject_ = 0;
     }
 
diff --git a/objective-c/src/Ice/Object.mm b/objective-c/src/Ice/Object.mm
index 2093a2b8cdc..48f4788a516 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 iceIncRef()
+    virtual void __incRef()
     {
         CFRetain(_object);
     }
 
-    virtual void iceDecRef()
+    virtual void __decRef()
     {
         CFRelease(_object);
     }
@@ -95,12 +95,12 @@ public:
 
     // We must explicitely CFRetain/CFRelease so that the garbage
     // collector does not trash the _blobject.
-    virtual void iceIncRef()
+    virtual void __incRef()
     {
         CFRetain(_blobject);
     }
 
-    virtual void iceDecRef()
+    virtual void __decRef()
     {
         CFRelease(_blobject);
     }
@@ -562,7 +562,7 @@ static NSString* ICEObject_all__[4] =
         {
             //
             // NOTE: IceObjC::ObjectI implements it own reference counting and there's no need
-            // to call iceIncRef/iceDecRef here. The C++ object and Objective-C object are sharing
+            // to call __incRef/__decRef here. The C++ object and Objective-C object are sharing
             // the same reference count (the one of the Objective-C object). This is necessary
             // to properly release both objects when there's either no more C++ handle/ObjC
             // reference to the object (without this, servants added to the object adapter
@@ -584,7 +584,7 @@ static NSString* ICEObject_all__[4] =
         {
             //
             // NOTE: IceObjC::ObjectI implements it own reference counting and there's no need
-            // to call iceIncRef/iceDecRef here. The C++ object and Objective-C object are sharing
+            // to call __incRef/__decRef here. The C++ object and Objective-C object are sharing
             // the same reference count (the one of the Objective-C object). This is necessary
             // to properly release both objects when there's either no more C++ handle/ObjC
             // reference to the object (without this, servants added to the object adapter
@@ -607,7 +607,7 @@ static NSString* ICEObject_all__[4] =
     }
 
     object__ = arg;
-    object__->iceIncRef();
+    object__->__incRef();
     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__->iceDecRef();
+    object__->__decRef();
     [super dealloc];
 }
 +(id) servantWrapperWithCxxObject:(Ice::Object*)arg
@@ -709,7 +709,7 @@ static NSString* ICEObject_all__[4] =
     NSException* nsex = nil;
     try
     {
-        object__->iceWrite([(ICEOutputStream*)os os]);
+        object__->__write([(ICEOutputStream*)os os]);
     }
     catch(const std::exception& ex)
     {
@@ -722,7 +722,7 @@ static NSString* ICEObject_all__[4] =
     NSException* nsex = nil;
     try
     {
-        object__->iceRead([(ICEInputStream*)is is]);
+        object__->__read([(ICEInputStream*)is is]);
     }
     catch(const std::exception& ex)
     {
diff --git a/objective-c/src/Ice/ObjectAdapterI.mm b/objective-c/src/Ice/ObjectAdapterI.mm
index b12de280639..53c0f8ebad4 100644
--- a/objective-c/src/Ice/ObjectAdapterI.mm
+++ b/objective-c/src/Ice/ObjectAdapterI.mm
@@ -102,7 +102,7 @@ public:
     }
 
     void
-    iceWrite(Ice::OutputStream* s) const
+    __write(Ice::OutputStream* s) const
     {
         ICEOutputStream* os = [[ICEOutputStream alloc] initWithCxxStream:s];
         [_ex write__:os];
@@ -110,13 +110,13 @@ public:
     }
 
     void
-    iceRead(Ice::InputStream*)
+    __read(Ice::InputStream*)
     {
         assert(false);
     }
 
     bool
-    iceUsesClasses() const
+    __usesClasses() const
     {
         return [_ex usesClasses__];
     }
@@ -141,8 +141,8 @@ public:
 
 protected:
 
-    virtual void iceWriteImpl(Ice::OutputStream*) const {}
-    virtual void iceReadImpl(Ice::InputStream*) {}
+    virtual void __writeImpl(Ice::OutputStream*) const {}
+    virtual void __readImpl(Ice::InputStream*) {}
 
 private:
 
diff --git a/objective-c/src/Ice/Proxy.mm b/objective-c/src/Ice/Proxy.mm
index 7ca6bf3ce7d..4c44532c3d8 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->iceIncRef();
+    ASYNCRESULT->__incRef();
     operation_ = [op retain];
     proxy_ = [p retain];
     return self;
@@ -209,7 +209,7 @@ BOOL _returnsData;
 
 -(void) dealloc
 {
-    ASYNCRESULT->iceDecRef();
+    ASYNCRESULT->__decRef();
     asyncResult__ = 0;
     [operation_ release];
     [proxy_ release];
@@ -322,7 +322,7 @@ BOOL _returnsData;
     }
     communicator__ = [ICECommunicator localObjectWithCxxObjectNoAutoRelease:arg->ice_getCommunicator().get()];
     objectPrx__ = arg.get();
-    OBJECTPRX->iceIncRef();
+    OBJECTPRX->__incRef();
     return self;
 }
 
@@ -333,7 +333,7 @@ BOOL _returnsData;
 
 -(void) dealloc
 {
-    OBJECTPRX->iceDecRef();
+    OBJECTPRX->__decRef();
     objectPrx__ = 0;
     [communicator__ release];
     [super dealloc];
@@ -828,7 +828,7 @@ BOOL _returnsData;
     try
     {
         std::pair<const Ice::Byte*, const Ice::Byte*> outParams;
-        BOOL ok = OBJECTPRX->iceI_end_ice_invoke(outParams, [result asyncResult__]);
+        BOOL ok = OBJECTPRX->___end_ice_invoke(outParams, [result asyncResult__]);
 
         ICEInputStream* is;
         is = [[ICEInputStream alloc] initWithCxxCommunicator:OBJECTPRX->ice_getCommunicator().get() data:outParams];
@@ -883,7 +883,7 @@ BOOL _returnsData;
 
 -(NSUInteger) hash
 {
-    return (NSUInteger)OBJECTPRX->iceHash();
+    return (NSUInteger)OBJECTPRX->__hash();
 }
 -(NSString*) description
 {
@@ -1342,7 +1342,7 @@ BOOL _returnsData;
                         },
                         ^(const Ice::AsyncResultPtr& result) {
                             std::pair<const ::Ice::Byte*, const ::Ice::Byte*> outP;
-                            BOOL ret__ = OBJECTPRX->iceI_end_ice_invoke(outP, result);
+                            BOOL ret__ = OBJECTPRX->___end_ice_invoke(outP, result);
                             if(response)
                             {
                                 NSMutableData* outEncaps =
@@ -1373,7 +1373,7 @@ BOOL _returnsData;
                         context,
                         ^(const Ice::AsyncResultPtr& result) {
                             std::pair<const ::Ice::Byte*, const ::Ice::Byte*> outP;
-                            BOOL ret__ = OBJECTPRX->iceI_end_ice_invoke(outP, result);
+                            BOOL ret__ = OBJECTPRX->___end_ice_invoke(outP, result);
                             if(response)
                             {
                                 NSMutableData* outEncaps =
@@ -1390,7 +1390,7 @@ BOOL _returnsData;
     endCppCall(^(const Ice::AsyncResultPtr& r)
                {
                    std::pair<const ::Ice::Byte*, const ::Ice::Byte*> outP;
-                   ret__ = OBJECTPRX->iceI_end_ice_invoke(outP, r);
+                   ret__ = OBJECTPRX->___end_ice_invoke(outP, r);
                    *outEncaps = [NSMutableData dataWithBytes:outP.first length:(outP.second - outP.first)];
                }, result);
     return ret__;
diff --git a/objective-c/src/Ice/SlicedData.mm b/objective-c/src/Ice/SlicedData.mm
index 4b3856e04c7..f4c746141a2 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__->iceIncRef();
+    self->slicedData__->__incRef();
     return self;
 }
 
 -(void) dealloc
 {
-    self->slicedData__->iceDecRef();
+    self->slicedData__->__decRef();
     [super dealloc];
 }
 
diff --git a/objective-c/src/Ice/Stream.mm b/objective-c/src/Ice/Stream.mm
index f1f2f04595c..179ec095031 100644
--- a/objective-c/src/Ice/Stream.mm
+++ b/objective-c/src/Ice/Stream.mm
@@ -46,7 +46,7 @@ public:
     }
 
     virtual void
-    iceWrite(Ice::OutputStream* stream) const
+    __write(Ice::OutputStream* stream) const
     {
         @try
         {
@@ -59,7 +59,7 @@ public:
     }
 
     virtual void
-    iceRead(Ice::InputStream* stream)
+    __read(Ice::InputStream* stream)
     {
         @try
         {
@@ -268,7 +268,7 @@ public:
     }
 
     virtual bool
-    iceUsesClasses() const
+    __usesClasses() const
     {
         return [_ex usesClasses__];
     }
@@ -292,13 +292,13 @@ public:
     }
 
     virtual void
-    iceWrite(Ice::OutputStream* s) const
+    __write(Ice::OutputStream* s) const
     {
         [_ex write__:static_cast<ICEOutputStream*>(s->getClosure())];
     }
 
     virtual void
-    iceRead(Ice::InputStream* s)
+    __read(Ice::InputStream* s)
     {
         [_ex read__:static_cast<ICEInputStream*>(s->getClosure())];
     }
@@ -311,8 +311,8 @@ public:
 
 protected:
 
-    virtual void iceWriteImpl(Ice::OutputStream*) const {}
-    virtual void iceReadImpl(Ice::InputStream*) {}
+    virtual void __writeImpl(Ice::OutputStream*) const {}
+    virtual void __readImpl(Ice::InputStream*) {}
 
 private: