summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/SessionRouterI.cpp6
-rw-r--r--cpp/src/Ice/GCObject.cpp36
-rw-r--r--cpp/src/Ice/IPEndpointI.cpp4
-rw-r--r--cpp/src/Ice/Instance.cpp6
-rw-r--r--cpp/src/Ice/Thread.cpp32
-rw-r--r--cpp/src/Ice/ThreadPool.cpp8
-rw-r--r--cpp/src/Ice/Timer.cpp8
-rw-r--r--cpp/src/IceBT/DBus.cpp8
-rw-r--r--cpp/src/IceGrid/NodeCache.cpp4
-rw-r--r--cpp/src/IceGrid/NodeCache.h4
-rw-r--r--cpp/src/IceGrid/NodeSessionI.cpp8
-rw-r--r--cpp/src/IceGrid/ReplicaSessionI.cpp8
-rw-r--r--cpp/src/IceGridLib/PluginFacadeI.cpp4
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.cpp4
-rw-r--r--cpp/src/IceStorm/Instance.cpp6
-rw-r--r--cpp/src/IceStorm/TopicI.cpp6
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp6
-rw-r--r--cpp/src/IceUtil/Shared.cpp8
-rw-r--r--cpp/src/Slice/CPlusPlusUtil.cpp4
19 files changed, 85 insertions, 85 deletions
diff --git a/cpp/src/Glacier2/SessionRouterI.cpp b/cpp/src/Glacier2/SessionRouterI.cpp
index 9f774b79a8e..e494f88839a 100644
--- a/cpp/src/Glacier2/SessionRouterI.cpp
+++ b/cpp/src/Glacier2/SessionRouterI.cpp
@@ -678,7 +678,7 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
{
if(_sessionThread)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
try
{
_sessionThread->start();
@@ -687,10 +687,10 @@ SessionRouterI::SessionRouterI(const InstancePtr& instance,
{
_sessionThread->destroy();
_sessionThread = 0;
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
try
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index 7623a0b91ef..fb2cb3d3f7b 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->__getRefUnsafe() - 1));
- if(obj->__hasFlag(GCObject::Collectable))
+ _counts.insert(make_pair(obj, obj->iceGetRefUnsafe() - 1));
+ if(obj->iceHasFlag(GCObject::Collectable))
{
obj->iceGcVisitMembers(*this);
}
@@ -224,11 +224,11 @@ MarkCollectable::visit(GCObject* obj)
// strong components of the graph.
//
- if(obj->__hasFlag(GCObject::Collectable))
+ if(obj->iceHasFlag(GCObject::Collectable))
{
return false;
}
- obj->__setFlag(GCObject::Collectable);
+ obj->iceSetFlag(GCObject::Collectable);
_numbers[obj] = ++_counter;
_p.push(obj);
@@ -243,7 +243,7 @@ MarkCollectable::visit(GCObject* obj)
{
o = _s.top();
_s.pop();
- o->__setFlag(GCObject::CycleMember);
+ o->iceSetFlag(GCObject::CycleMember);
}
while(o != obj);
_p.pop();
@@ -259,7 +259,7 @@ MarkCollectable::visitNeighbor(GCObject* obj)
{
visit(obj);
}
- else if(!obj->__hasFlag(GCObject::CycleMember))
+ else if(!obj->iceHasFlag(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->__hasFlag(GCObject::Collectable))
+ if(obj->iceHasFlag(GCObject::Collectable))
{
- obj->__clearFlag(GCObject::Collectable | GCObject::CycleMember);
+ obj->iceClearFlag(GCObject::Collectable | GCObject::CycleMember);
obj->iceGcVisitMembers(*this);
}
return false;
@@ -306,14 +306,14 @@ const unsigned char GCObject::Visiting = 8;
// GCObject
//
void
-IceInternal::GCObject::__incRef()
+IceInternal::GCObject::iceIncRef()
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
++_ref;
}
void
-IceInternal::GCObject::__decRef()
+IceInternal::GCObject::iceDecRef()
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
bool doDelete = false;
@@ -323,15 +323,15 @@ IceInternal::GCObject::__decRef()
// Try to collect the object each time its reference count is
// decremented and only if it's part of a cycle.
//
- if(_ref > 1 && __hasFlag(CycleMember) && collect(lock))
+ if(_ref > 1 && iceHasFlag(CycleMember) && collect(lock))
{
return;
}
if(--_ref == 0)
{
- doDelete = !__hasFlag(NoDelete);
- __setFlag(NoDelete);
+ doDelete = !iceHasFlag(NoDelete);
+ iceSetFlag(NoDelete);
}
lock.release();
@@ -342,17 +342,17 @@ IceInternal::GCObject::__decRef()
}
int
-IceInternal::GCObject::__getRef() const
+IceInternal::GCObject::iceGetRef() const
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
return _ref;
}
void
-IceInternal::GCObject::__setNoDelete(bool b)
+IceInternal::GCObject::iceSetNoDelete(bool b)
{
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(gcMutex);
- IceUtil::Shared::__setNoDelete(b);
+ IceUtil::Shared::iceSetNoDelete(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->__setFlag(NoDelete);
- p->first->__clearFlag(CycleMember); // Disable cycle collection.
+ p->first->iceSetFlag(NoDelete);
+ p->first->iceClearFlag(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 10983ccc672..b5017cbf596 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)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
try
{
updateObserver();
@@ -518,7 +518,7 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
}
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
void
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 304036dec90..08987b7dace 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
{
- __setNoDelete(true);
+ iceSetNoDelete(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);
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
catch(...)
{
@@ -1273,7 +1273,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
instanceList->remove(this);
}
destroy();
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
}
diff --git a/cpp/src/Ice/Thread.cpp b/cpp/src/Ice/Thread.cpp
index 7882a0a2948..8c3e03cfd46 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->__decRef();
+ rawThread->iceDecRef();
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
- // __decRef().
+ // iceDecRef().
//
- __incRef();
+ iceIncRef();
_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->__decRef();
+ rawThread->iceDecRef();
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
- // __decRef().
+ // iceDecRef().
//
- __incRef();
+ iceIncRef();
unsigned int id;
_handle =
@@ -460,7 +460,7 @@ IceUtil::Thread::start(size_t stackSize, int priority)
assert(_handle != (HANDLE)-1L);
if(_handle == 0)
{
- __decRef();
+ iceDecRef();
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)
{
- __decRef();
+ iceDecRef();
throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
}
@@ -643,7 +643,7 @@ startHook(void* arg)
//
// See the comment in IceUtil::Thread::start() for details.
//
- rawThread->__decRef();
+ rawThread->iceDecRef();
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
- // __decRef().
+ // iceDecRef().
//
- __incRef();
+ iceIncRef();
pthread_attr_t attr;
int rc = pthread_attr_init(&attr);
if(rc != 0)
{
- __decRef();
+ iceDecRef();
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)
{
- __decRef();
+ iceDecRef();
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)
{
- __decRef();
+ iceDecRef();
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)
{
- __decRef();
+ iceDecRef();
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)
{
- __decRef();
+ iceDecRef();
throw ThreadSyscallException(__FILE__, __LINE__, rc);
}
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 3769458371b..5412db05acc 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;
}
- __setNoDelete(true);
+ iceSetNoDelete(true);
try
{
for(int i = 0 ; i < _size ; ++i)
@@ -399,15 +399,15 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
destroy();
joinWithAllThreads();
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
catch(...)
{
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
IceInternal::ThreadPool::~ThreadPool()
diff --git a/cpp/src/Ice/Timer.cpp b/cpp/src/Ice/Timer.cpp
index c19ba12a92b..f85895456d0 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)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
start();
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
Timer::Timer(int priority) :
Thread("IceUtil timer thread"),
_destroyed(false)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
start(0, priority);
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
void
diff --git a/cpp/src/IceBT/DBus.cpp b/cpp/src/IceBT/DBus.cpp
index 21b1c960b93..2b40398b39a 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.
//
- __incRef();
+ iceIncRef();
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->__decRef();
+ r->iceDecRef();
}
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);
- __incRef(); // iceDecRef called in freeConnection.
+ iceIncRef(); // 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->__decRef();
+ c->iceDecRef();
}
}
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 8757dc0fe2b..abac64ac90c 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::__incRef()
+NodeEntry::iceIncRef()
{
Lock sync(*this);
assert(_ref >= 0);
@@ -730,7 +730,7 @@ NodeEntry::__incRef()
}
void
-NodeEntry::__decRef()
+NodeEntry::iceDecRef()
{
//
// 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 1346cdb3ee2..88b1bf88fa7 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 __incRef();
- void __decRef();
+ void iceIncRef();
+ void iceDecRef();
void checkSession() const;
void setProxy(const NodePrx&);
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index 01bbb7679c0..9accf0eb7f3 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)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
try
{
_database->getNode(info->name, true)->setSession(this);
@@ -159,7 +159,7 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
}
catch(const NodeActiveException&)
{
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
catch(...)
@@ -174,10 +174,10 @@ NodeSessionI::NodeSessionI(const DatabasePtr& database,
_database->getNode(info->name)->setSession(0);
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
void
diff --git a/cpp/src/IceGrid/ReplicaSessionI.cpp b/cpp/src/IceGrid/ReplicaSessionI.cpp
index acb3f2e56d2..983ebd24430 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)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
try
{
_database->getReplicaCache().add(info->name, this);
@@ -54,7 +54,7 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
}
catch(const ReplicaActiveException&)
{
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
catch(...)
@@ -64,10 +64,10 @@ ReplicaSessionI::ReplicaSessionI(const DatabasePtr& database,
_database->getReplicaCache().remove(_info->name, false);
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
void
diff --git a/cpp/src/IceGridLib/PluginFacadeI.cpp b/cpp/src/IceGridLib/PluginFacadeI.cpp
index f84f33dff0b..5747f2e0b1d 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->__decRef();
+ pluginFacade->iceDecRef();
}
pluginFacade = facade.get();
if(pluginFacade)
{
- pluginFacade->__incRef();
+ pluginFacade->iceIncRef();
}
#endif
}
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp
index 84238614220..76b4e562afa 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)
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
//
// Initialize OpenSSL if necessary.
@@ -325,7 +325,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) :
# endif
}
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
OpenSSLEngine::~OpenSSLEngine()
diff --git a/cpp/src/IceStorm/Instance.cpp b/cpp/src/IceStorm/Instance.cpp
index 6d8334cab4d..7f92944c498 100644
--- a/cpp/src/IceStorm/Instance.cpp
+++ b/cpp/src/IceStorm/Instance.cpp
@@ -117,7 +117,7 @@ Instance::Instance(
{
try
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
Ice::PropertiesPtr properties = communicator->getProperties();
if(properties->getProperty(name + ".TopicManager.AdapterId").empty())
@@ -167,11 +167,11 @@ Instance::Instance(
{
shutdown();
destroy();
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
Instance::~Instance()
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index acea59e5c15..c89e3146211 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -352,7 +352,7 @@ TopicImpl::TopicImpl(
{
try
{
- __setNoDelete(true);
+ iceSetNoDelete(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();
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
TopicImpl::~TopicImpl()
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 5c4ad1c6cbc..57f5b619a4b 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -255,7 +255,7 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) :
{
try
{
- __setNoDelete(true);
+ iceSetNoDelete(true);
if(_instance->observer())
{
@@ -319,10 +319,10 @@ TopicManagerImpl::TopicManagerImpl(const PersistentInstancePtr& instance) :
catch(...)
{
shutdown();
- __setNoDelete(false);
+ iceSetNoDelete(false);
throw;
}
- __setNoDelete(false);
+ iceSetNoDelete(false);
}
TopicManagerImpl::~TopicManagerImpl()
diff --git a/cpp/src/IceUtil/Shared.cpp b/cpp/src/IceUtil/Shared.cpp
index 75b43462398..c9c924fef27 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::__incRef()
+IceUtil::Shared::iceIncRef()
{
assert(_ref >= 0);
++_ref;
}
void
-IceUtil::Shared::__decRef()
+IceUtil::Shared::iceDecRef()
{
assert(_ref > 0);
if(--_ref == 0 && !(_flags & NoDelete))
@@ -64,13 +64,13 @@ IceUtil::Shared::__decRef()
}
int
-IceUtil::Shared::__getRef() const
+IceUtil::Shared::iceGetRef() const
{
return _ref;
}
void
-IceUtil::Shared::__setNoDelete(bool b)
+IceUtil::Shared::iceSetNoDelete(bool b)
{
_flags = b ? (_flags | NoDelete) : (_flags & ~NoDelete);
}
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index f8bd97508fb..bbdff8765af 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 << ".__setIsSet();";
+ out << nl << paramName << ".iceSetIsSet();";
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 << ".__setIsSet();";
+ out << nl << paramName << ".iceSetIsSet();";
out << nl << paramName << "->first = (*" << escapedParamName << ").begin();";
out << nl << paramName << "->second = (*" << escapedParamName << ").end();";
out << eb;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:33:23 +0000