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

This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.

4 files changed, 12 insertions, 12 deletions

diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index abac64ac90c..8757dc0fe2b 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -722,7 +722,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& server, const SessionIP
 }
 
 void
-NodeEntry::iceIncRef()
+NodeEntry::__incRef()
 {
     Lock sync(*this);
     assert(_ref >= 0);
@@ -730,7 +730,7 @@ NodeEntry::iceIncRef()
 }
 
 void
-NodeEntry::iceDecRef()
+NodeEntry::__decRef()
 {
     //
     // The node entry implements its own reference counting. If the
diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h
index 88b1bf88fa7..1346cdb3ee2 100644
--- a/cpp/src/IceGrid/NodeCache.h
+++ b/cpp/src/IceGrid/NodeCache.h
@@ -62,8 +62,8 @@ public:
     ServerInfo getServerInfo(const ServerInfo&, const SessionIPtr&);
     InternalServerDescriptorPtr getInternalServerDescriptor(const ServerInfo&, const SessionIPtr&);
     
-    void iceIncRef();
-    void iceDecRef();
+    void __incRef();
+    void __decRef();
 
     void checkSession() const;
     void setProxy(const NodePrx&);
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index 9accf0eb7f3..01bbb7679c0 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -145,7 +145,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
     _load(load),
     _destroy(false)
 {
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     try
     {
         _database->getNode(info->name, true)->setSession(this);
@@ -159,7 +159,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
     }
     catch(const NodeActiveException&)
     {
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
     catch(...)
@@ -174,10 +174,10 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
 
         _database->getNode(info->name)->setSession(0);
 
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 void
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index 983ebd24430..acb3f2e56d2 100644
--- a/cpp/src/IceGrid/ReplicaSessionI.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionI.cpp
@@ -42,7 +42,7 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
     _timestamp(IceUtil::Time::now(IceUtil::Time::Monotonic)),
     _destroy(false)
 {
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     try
     {
         _database->getReplicaCache().add(info->name, this);
@@ -54,7 +54,7 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
     }
     catch(const ReplicaActiveException&)
     {
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
     catch(...)
@@ -64,10 +64,10 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
 
         _database->getReplicaCache().remove(_info->name, false);
 
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 void