Reverted previous double-underscore changes in IceUtil classes

28 files changed, 145 insertions, 145 deletions

diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index ad18de931ca..0c1afc028e3 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -47,10 +47,10 @@ public:
     //
     // Override IceUtil::Shared methods
     //
-    virtual void iceIncRef();
-    virtual void iceDecRef();
-    virtual int iceGetRef() const;
-    virtual void iceSetNoDelete(bool);
+    virtual void __incRef();
+    virtual void __decRef();
+    virtual int __getRef() const;
+    virtual void __setNoDelete(bool);
 
     //
     // Override Object methods
@@ -64,7 +64,7 @@ public:
     //
     virtual void iceGcVisitMembers(IceInternal::GCVisitor&) = 0;
 
-    int iceGetRefUnsafe()
+    int __getRefUnsafe()
     {
         return _ref;
     }
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h
index 927ad362b13..6e5d4d291a8 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;
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h
index c570d7cbe77..ef2c1c97cf5 100644
--- a/cpp/include/Ice/InputStream.h
+++ b/cpp/include/Ice/InputStream.h
@@ -383,7 +383,7 @@ public:
 #ifdef ICE_CPP11_MAPPING
             v.emplace();
 #else
-            v.iceSetIsSet();
+            v.__setIsSet();
 #endif
             StreamOptionalHelper<T,
                                  StreamableTraits<T>::helper,
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 0e39dfa9ef6..f97bfeb46eb 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;
diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h
index 19991681cbc..91a58be60f0 100644
--- a/cpp/include/IceUtil/Handle.h
+++ b/cpp/include/IceUtil/Handle.h
@@ -154,7 +154,7 @@ public:
 
         if(this->_ptr)
         {
-            this->_ptr->iceIncRef();
+            this->_ptr->__incRef();
         }
     }
     
@@ -165,7 +165,7 @@ public:
 
         if(this->_ptr)
         {
-            this->_ptr->iceIncRef();
+            this->_ptr->__incRef();
         }
     }
 
@@ -175,7 +175,7 @@ public:
 
         if(this->_ptr)
         {
-            this->_ptr->iceIncRef();
+            this->_ptr->__incRef();
         }
     }
     
@@ -183,7 +183,7 @@ public:
     {
         if(this->_ptr)
         {
-            this->_ptr->iceDecRef();
+            this->_ptr->__decRef();
         }
     }
     
@@ -193,7 +193,7 @@ public:
         {
             if(p)
             {
-                p->iceIncRef();
+                p->__incRef();
             }
 
             T* ptr = this->_ptr;
@@ -201,7 +201,7 @@ public:
 
             if(ptr)
             {
-                ptr->iceDecRef();
+                ptr->__decRef();
             }
         }
         return *this;
@@ -214,7 +214,7 @@ public:
         {
             if(r._ptr)
             {
-                r._ptr->iceIncRef();
+                r._ptr->__incRef();
             }
 
             T* ptr = this->_ptr;
@@ -222,7 +222,7 @@ public:
 
             if(ptr)
             {
-                ptr->iceDecRef();
+                ptr->__decRef();
             }
         }
         return *this;
@@ -234,7 +234,7 @@ public:
         {
             if(r._ptr)
             {
-                r._ptr->iceIncRef();
+                r._ptr->__incRef();
             }
 
             T* ptr = this->_ptr;
@@ -242,7 +242,7 @@ public:
 
             if(ptr)
             {
-                ptr->iceDecRef();
+                ptr->__decRef();
             }
         }
         return *this;
diff --git a/cpp/include/IceUtil/Optional.h b/cpp/include/IceUtil/Optional.h
index c7edf344ee8..60493e30fe3 100644
--- a/cpp/include/IceUtil/Optional.h
+++ b/cpp/include/IceUtil/Optional.h
@@ -143,7 +143,7 @@ public:
         std::swap(_value, other._value);
     }
 
-    void iceSetIsSet()
+    void __setIsSet()
     {
         _isSet = true;
     }
diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h
index b9971c3d855..756b10e5f22 100644
--- a/cpp/include/IceUtil/Shared.h
+++ b/cpp/include/IceUtil/Shared.h
@@ -45,13 +45,13 @@ public:
         return *this;
     }
 
-    void iceIncRef()
+    void __incRef()
     {
         assert(_ref >= 0);
         ++_ref;
     }
 
-    void iceDecRef()
+    void __decRef()
     {
         assert(_ref > 0);
         if(--_ref == 0)
@@ -63,12 +63,12 @@ public:
         }
     }
 
-    int iceGetRef() const
+    int __getRef() const
     {
         return _ref;
     }
 
-    void iceSetNoDelete(bool b)
+    void __setNoDelete(bool b)
     {
         _noDelete = b;
     }
@@ -101,22 +101,22 @@ public:
         return *this;
     }
 
-    virtual void iceIncRef();
-    virtual void iceDecRef();
-    virtual int iceGetRef() const;
-    virtual void iceSetNoDelete(bool);
+    virtual void __incRef();
+    virtual void __decRef();
+    virtual int __getRef() const;
+    virtual void __setNoDelete(bool);
 
-    void iceSetFlag(unsigned char flag)
+    void __setFlag(unsigned char flag)
     {
         _flags |= flag;
     }
 
-    void iceClearFlag(unsigned char flag)
+    void __clearFlag(unsigned char flag)
     {
         _flags &= ~flag;
     }
 
-    bool iceHasFlag(unsigned char flag)
+    bool __hasFlag(unsigned char flag)
     {
         return (_flags & flag) > 0;
     }
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index e494f88839a..9f774b79a8e 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -678,7 +678,7 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
 {
     if(_sessionThread)
     {
-        iceSetNoDelete(true);
+        __setNoDelete(true);
         try
         {
             _sessionThread->start();
@@ -687,10 +687,10 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
         {
             _sessionThread->destroy();
             _sessionThread = 0;
-            iceSetNoDelete(false);
+            __setNoDelete(false);
             throw;
         }
-        iceSetNoDelete(false);
+        __setNoDelete(false);
     }
 
     try
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index fb2cb3d3f7b..7623a0b91ef 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -142,8 +142,8 @@ DecreaseRefCounts::visit(GCObject* obj)
     GCCountMap::iterator p = _counts.find(obj);
     if(p == _counts.end())
     {
-        _counts.insert(make_pair(obj, obj->iceGetRefUnsafe() - 1));
-        if(obj->iceHasFlag(GCObject::Collectable))
+        _counts.insert(make_pair(obj, obj->__getRefUnsafe() - 1));
+        if(obj->__hasFlag(GCObject::Collectable))
         {
             obj->iceGcVisitMembers(*this);
         }
@@ -224,11 +224,11 @@ MarkCollectable::visit(GCObject* obj)
     // strong components of the graph.
     //
 
-    if(obj->iceHasFlag(GCObject::Collectable))
+    if(obj->__hasFlag(GCObject::Collectable))
     {
         return false;
     }
-    obj->iceSetFlag(GCObject::Collectable);
+    obj->__setFlag(GCObject::Collectable);
         
     _numbers[obj] = ++_counter;
     _p.push(obj);
@@ -243,7 +243,7 @@ MarkCollectable::visit(GCObject* obj)
         {
             o = _s.top();
             _s.pop();
-            o->iceSetFlag(GCObject::CycleMember);
+            o->__setFlag(GCObject::CycleMember);
         }
         while(o != obj);
         _p.pop();
@@ -259,7 +259,7 @@ MarkCollectable::visitNeighbor(GCObject* obj)
     {
         visit(obj);
     }
-    else if(!obj->iceHasFlag(GCObject::CycleMember))
+    else if(!obj->__hasFlag(GCObject::CycleMember))
     {
         while(_numbers[_p.top()] > p->second)
         {
@@ -287,9 +287,9 @@ ClearCollectable::visit(GCObject* obj)
     //
     // Clear the collectable flag on the object graph.
     //
-    if(obj->iceHasFlag(GCObject::Collectable))
+    if(obj->__hasFlag(GCObject::Collectable))
     {
-        obj->iceClearFlag(GCObject::Collectable | GCObject::CycleMember);
+        obj->__clearFlag(GCObject::Collectable | GCObject::CycleMember);
         obj->iceGcVisitMembers(*this);
     }
     return false;
@@ -306,14 +306,14 @@ const unsigned char GCObject::Visiting = 8;
 // GCObject
 //
 void
-IceInternal::GCObject::iceIncRef()
+IceInternal::GCObject::__incRef()
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
     ++_ref;
 }
 
 void
-IceInternal::GCObject::iceDecRef()
+IceInternal::GCObject::__decRef()
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
     bool doDelete = false;
@@ -323,15 +323,15 @@ IceInternal::GCObject::iceDecRef()
     // Try to collect the object each time its reference count is
     // decremented and only if it's part of a cycle.
     //
-    if(_ref > 1 && iceHasFlag(CycleMember) && collect(lock))
+    if(_ref > 1 && __hasFlag(CycleMember) && collect(lock))
     {
         return;
     }
 
     if(--_ref == 0)
     {
-        doDelete = !iceHasFlag(NoDelete);
-        iceSetFlag(NoDelete);
+        doDelete = !__hasFlag(NoDelete);
+        __setFlag(NoDelete);
     }
 
     lock.release();
@@ -342,17 +342,17 @@ IceInternal::GCObject::iceDecRef()
 }
 
 int
-IceInternal::GCObject::iceGetRef() const
+IceInternal::GCObject::__getRef() const
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
     return _ref;
 }
 
 void
-IceInternal::GCObject::iceSetNoDelete(bool b)
+IceInternal::GCObject::__setNoDelete(bool b)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
-    IceUtil::Shared::iceSetNoDelete(b);
+    IceUtil::Shared::__setNoDelete(b);
 }
 
 bool
@@ -431,8 +431,8 @@ GCObject::collect(IceUtilInternal::MutexPtrLock<IceUtil::Mutex>& lock)
     //
     for(GCCountMap::const_iterator p = counts.begin(); p != counts.end(); ++p)
     {
-        p->first->iceSetFlag(NoDelete);
-        p->first->iceClearFlag(CycleMember); // Disable cycle collection.
+        p->first->__setFlag(NoDelete);
+        p->first->__clearFlag(CycleMember); // Disable cycle collection.
     }
     for(GCCountMap::const_iterator p = counts.begin(); p != counts.end(); ++p)
     {
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index b5017cbf596..10983ccc672 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -495,7 +495,7 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
     _preferIPv6(instance->preferIPv6()),
     _destroyed(false)
 {
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     try
     {
         updateObserver();
@@ -518,7 +518,7 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
         }
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 void
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 08987b7dace..304036dec90 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -956,7 +956,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 {
     try
     {
-        iceSetNoDelete(true);
+        __setNoDelete(true);
         {
             IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(staticMutex);
             instanceList->push_back(this);
@@ -1264,7 +1264,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 
         _retryQueue = new RetryQueue(this);
 
-        iceSetNoDelete(false);
+        __setNoDelete(false);
     }
     catch(...)
     {
@@ -1273,7 +1273,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
             instanceList->remove(this);
         }
         destroy();
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
 }
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 8c3e03cfd46..7882a0a2948 100644
--- a/cpp/src/Ice/Thread.cpp
+++ b/cpp/src/Ice/Thread.cpp
@@ -162,7 +162,7 @@ WINAPI startHook(void* arg)
         //
         // See the comment in IceUtil::Thread::start() for details.
         //
-        rawThread->iceDecRef();
+        rawThread->__decRef();
         thread->run();
     }
     catch(...)
@@ -209,9 +209,9 @@ IceUtil::Thread::start(size_t, int)
     // object could be deleted before the thread object takes
     // ownership. It's also necessary to increment the reference count
     // prior to calling pthread_create since the thread itself calls
-    // iceDecRef().
+    // __decRef().
     //
-    iceIncRef();
+    __incRef();
     _thread.reset(new thread(startHook, this));
 
     _started = true;
@@ -397,7 +397,7 @@ WINAPI startHook(void* arg)
         //
         // See the comment in IceUtil::Thread::start() for details.
         //
-        rawThread->iceDecRef();
+        rawThread->__decRef();
         thread->run();
     }
     catch(...)
@@ -444,9 +444,9 @@ IceUtil::Thread::start(size_t stackSize, int priority)
     // object could be deleted before the thread object takes
     // ownership. It's also necessary to increment the reference count
     // prior to calling pthread_create since the thread itself calls
-    // iceDecRef().
+    // __decRef().
     //
-    iceIncRef();
+    __incRef();
     
     unsigned int id;
     _handle = 
@@ -460,7 +460,7 @@ IceUtil::Thread::start(size_t stackSize, int priority)
     assert(_handle != (HANDLE)-1L);
     if(_handle == 0)
     {
-        iceDecRef();
+        __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
     if(SetThreadPriority(_handle, priority) == 0)
@@ -469,7 +469,7 @@ IceUtil::Thread::start(size_t stackSize, int priority)
     }
     if(static_cast<int>(ResumeThread(_handle)) == -1)
     {
-        iceDecRef();
+        __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
 
@@ -643,7 +643,7 @@ startHook(void* arg)
         //
         // See the comment in IceUtil::Thread::start() for details.
         //
-        rawThread->iceDecRef();
+        rawThread->__decRef();
         thread->run();
     }
     catch(...)
@@ -695,15 +695,15 @@ IceUtil::Thread::start(size_t stackSize, bool realtimeScheduling, int priority)
     // object could be deleted before the thread object takes
     // ownership. It's also necessary to increment the reference count
     // prior to calling pthread_create since the thread itself calls
-    // iceDecRef().
+    // __decRef().
     //
-    iceIncRef();
+    __incRef();
 
     pthread_attr_t attr;
     int rc = pthread_attr_init(&attr);
     if(rc != 0)
     {
-        iceDecRef();
+        __decRef();
         pthread_attr_destroy(&attr);
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
     }
@@ -722,7 +722,7 @@ IceUtil::Thread::start(size_t stackSize, bool realtimeScheduling, int priority)
         rc = pthread_attr_setstacksize(&attr, stackSize);
         if(rc != 0)
         {
-            iceDecRef();
+            __decRef();
             pthread_attr_destroy(&attr);
             throw ThreadSyscallException(__FILE__, __LINE__, rc);
         }
@@ -733,7 +733,7 @@ IceUtil::Thread::start(size_t stackSize, bool realtimeScheduling, int priority)
         rc = pthread_attr_setschedpolicy(&attr, SCHED_RR);
         if(rc != 0)
         {
-            iceDecRef();
+            __decRef();
             throw ThreadSyscallException(__FILE__, __LINE__, rc);
         }
         sched_param param;
@@ -741,7 +741,7 @@ IceUtil::Thread::start(size_t stackSize, bool realtimeScheduling, int priority)
         rc = pthread_attr_setschedparam(&attr, &param);
         if(rc != 0)
         {
-            iceDecRef();
+            __decRef();
             pthread_attr_destroy(&attr);
             throw ThreadSyscallException(__FILE__, __LINE__, rc);
         }
@@ -751,7 +751,7 @@ IceUtil::Thread::start(size_t stackSize, bool realtimeScheduling, int priority)
     pthread_attr_destroy(&attr);
     if(rc != 0)
     {
-        iceDecRef();
+        __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
     }
 
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 5412db05acc..3769458371b 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -373,7 +373,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
             << _sizeWarn;
     }
 
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     try
     {
         for(int i = 0 ; i < _size ; ++i)
@@ -399,15 +399,15 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
 
         destroy();
         joinWithAllThreads();
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
     catch(...)
     {
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 IceInternal::ThreadPool::~ThreadPool()
diff --git a/cpp/src/Ice/Timer.cpp b/cpp/src/Ice/Timer.cpp
index f85895456d0..c19ba12a92b 100644
--- a/cpp/src/Ice/Timer.cpp
+++ b/cpp/src/Ice/Timer.cpp
@@ -22,18 +22,18 @@ Timer::Timer() :
     Thread("IceUtil timer thread"),
     _destroyed(false)
 {
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     start();
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 Timer::Timer(int priority) :
     Thread("IceUtil timer thread"),
     _destroyed(false)
 {
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     start(0, priority);
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 void
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 2b40398b39a..21b1c960b93 100644
--- a/cpp/src/IceBT/DBus.cpp
+++ b/cpp/src/IceBT/DBus.cpp
@@ -826,7 +826,7 @@ public:
         // Bump our refcount to ensure this object lives until the reply is received.
         // The pendingFree function will decrement the refcount.
         //
-        iceIncRef();
+        __incRef();
 
         if(!::dbus_pending_call_set_notify(_call, pendingCallCompletedCallback, this, pendingCallFree))
         {
@@ -971,7 +971,7 @@ pendingCallFree(void* userData)
 {
     AsyncResultI* r = static_cast<AsyncResultI*>(userData);
     assert(r);
-    r->iceDecRef();
+    r->__decRef();
 }
 
 static DBusHandlerResult filterCallback(DBusConnection*, DBusMessage*, void*);
@@ -1117,7 +1117,7 @@ public:
         ::dbus_bus_add_match(_connection, "type='signal'", 0);
         //::dbus_bus_add_match(_connection, "type='method_call'", 0);
 
-        iceIncRef(); // iceDecRef called in freeConnection.
+        __incRef(); // iceDecRef called in freeConnection.
 
         _thread = new HelperThread(this);
         _thread->start();
@@ -1229,7 +1229,7 @@ static void freeConnection(void* p)
 {
     ConnectionI* c = static_cast<ConnectionI*>(p);
     assert(c);
-    c->iceDecRef();
+    c->__decRef();
 }
 
 }
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
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index 5747f2e0b1d..f84f33dff0b 100644
--- a/cpp/src/IceGridLib/PluginFacadeI.cpp
+++ b/cpp/src/IceGridLib/PluginFacadeI.cpp
@@ -46,12 +46,12 @@ IceGrid::setRegistryPluginFacade(const RegistryPluginFacadePtr& facade)
 #else
     if(pluginFacade)
     {
-        pluginFacade->iceDecRef();
+        pluginFacade->__decRef();
     }
     pluginFacade = facade.get();
     if(pluginFacade)
     {
-        pluginFacade->iceIncRef();
+        pluginFacade->__incRef();
     }
 #endif
 }
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index 76b4e562afa..84238614220 100644
--- a/cpp/src/IceSSL/OpenSSLEngine.cpp
+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp
@@ -195,7 +195,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) :
     _initialized(false),
     _ctx(0)
 {
-    iceSetNoDelete(true);
+    __setNoDelete(true);
 
     //
     // Initialize OpenSSL if necessary.
@@ -325,7 +325,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) :
 #  endif
         }
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 OpenSSLEngine::~OpenSSLEngine()
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index 7f92944c498..6d8334cab4d 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -117,7 +117,7 @@ Instance::Instance(
 {
     try
     {
-        iceSetNoDelete(true);
+        __setNoDelete(true);
 
         Ice::PropertiesPtr properties = communicator->getProperties();
         if(properties->getProperty(name + ".TopicManager.AdapterId").empty())
@@ -167,11 +167,11 @@ Instance::Instance(
     {
         shutdown();
         destroy();
-        iceSetNoDelete(false);
+        __setNoDelete(false);
 
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 Instance::~Instance()
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index c89e3146211..acea59e5c15 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -352,7 +352,7 @@ TopicImpl::TopicImpl(
 {
     try
     {
-        iceSetNoDelete(true);
+        __setNoDelete(true);
 
         // TODO: If we want to improve the performance of the
         // non-replicated case we could allocate a null-topic impl here.
@@ -435,10 +435,10 @@ TopicImpl::TopicImpl(
     catch(...)
     {
         shutdown();
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 TopicImpl::~TopicImpl()
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 57f5b619a4b..5c4ad1c6cbc 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -255,7 +255,7 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) :
 {
     try
     {
-        iceSetNoDelete(true);
+        __setNoDelete(true);
 
         if(_instance->observer())
         {
@@ -319,10 +319,10 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) :
     catch(...)
     {
         shutdown();
-        iceSetNoDelete(false);
+        __setNoDelete(false);
         throw;
     }
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 TopicManagerImpl::~TopicManagerImpl()
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index c9c924fef27..75b43462398 100644
--- a/cpp/src/IceUtil/Shared.cpp
+++ b/cpp/src/IceUtil/Shared.cpp
@@ -47,14 +47,14 @@ IceUtil::Shared::Shared(const Shared&) :
 }
 
 void
-IceUtil::Shared::iceIncRef()
+IceUtil::Shared::__incRef()
 {
     assert(_ref >= 0);
     ++_ref;
 }
 
 void
-IceUtil::Shared::iceDecRef()
+IceUtil::Shared::__decRef()
 {
     assert(_ref > 0);
     if(--_ref == 0 && !(_flags & NoDelete))
@@ -64,13 +64,13 @@ IceUtil::Shared::iceDecRef()
 }
 
 int
-IceUtil::Shared::iceGetRef() const
+IceUtil::Shared::__getRef() const
 {
     return _ref;
 }
 
 void
-IceUtil::Shared::iceSetNoDelete(bool b)
+IceUtil::Shared::__setNoDelete(bool b)
 {
     _flags = b ? (_flags | NoDelete) : (_flags & ~NoDelete);
 }
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index bbdff8765af..f8bd97508fb 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -269,7 +269,7 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string&
                 {
                     out << nl << "if(" << escapedParamName << ")";
                     out << sb;
-                    out << nl << paramName << ".iceSetIsSet();";
+                    out << nl << paramName << ".__setIsSet();";
                     out << nl << "if(!" << escapedParamName << "->empty())";
                     out << sb;
                     out << nl << paramName << "->first" << " = &(*" << escapedParamName << ")[0];";
@@ -301,7 +301,7 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string&
             {
                 out << nl << "if(" << escapedParamName << ")";
                 out << sb;
-                out << nl << paramName << ".iceSetIsSet();";
+                out << nl << paramName << ".__setIsSet();";
                 out << nl << paramName << "->first = (*" << escapedParamName << ").begin();";
                 out << nl << paramName << "->second = (*" << escapedParamName << ").end();";
                 out << eb;
diff --git a/cpp/test/Ice/dispatcher/Dispatcher.cpp b/cpp/test/Ice/dispatcher/Dispatcher.cpp
index 93b72a313c7..c725a9af4a1 100644
--- a/cpp/test/Ice/dispatcher/Dispatcher.cpp
+++ b/cpp/test/Ice/dispatcher/Dispatcher.cpp
@@ -18,9 +18,9 @@ Dispatcher::Dispatcher()
 {
     _instance = this;
     _terminated = false;
-    iceSetNoDelete(true);
+    __setNoDelete(true);
     start();
-    iceSetNoDelete(false);
+    __setNoDelete(false);
 }
 
 void
diff --git a/cpp/test/Ice/gc/Client.cpp b/cpp/test/Ice/gc/Client.cpp
index e6f6c9f188d..f19a02225fa 100644
--- a/cpp/test/Ice/gc/Client.cpp
+++ b/cpp/test/Ice/gc/Client.cpp
@@ -132,15 +132,15 @@ public:
 
     virtual bool visit(IceInternal::GCObject* obj)
     {
-        if(obj->iceHasFlag(IceInternal::GCObject::Visiting))
+        if(obj->__hasFlag(IceInternal::GCObject::Visiting))
         {
             return false;
         }
-        test(obj->iceHasFlag(IceInternal::GCObject::CycleMember) && obj->iceHasFlag(IceInternal::GCObject::Collectable));
+        test(obj->__hasFlag(IceInternal::GCObject::CycleMember) && obj->__hasFlag(IceInternal::GCObject::Collectable));
 
-        obj->iceSetFlag(IceInternal::GCObject::Visiting);
+        obj->__setFlag(IceInternal::GCObject::Visiting);
         obj->iceGcVisitMembers(*this);
-        obj->iceClearFlag(IceInternal::GCObject::Visiting);
+        obj->__clearFlag(IceInternal::GCObject::Visiting);
         return false;
     }
 };