summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/.depend2
-rw-r--r--cpp/src/Ice/Connection.cpp2
-rw-r--r--cpp/src/Ice/Object.cpp2
-rw-r--r--cpp/src/IceStorm/Subscriber.h2
-rw-r--r--cpp/src/IceStorm/TopicI.cpp4
-rw-r--r--cpp/src/IceUtil/Cond.cpp10
-rw-r--r--cpp/src/IceUtil/RWRecMutex.cpp10
-rw-r--r--cpp/src/IceUtil/RecMutex.cpp20
8 files changed, 26 insertions, 26 deletions
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index 3560b1eca99..ad7897bc7a3 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -62,6 +62,6 @@ SslConnectionOpenSSLServer.o: SslConnectionOpenSSLServer.cpp ../Ice/Network.h ..
SslFactory.o: SslFactory.cpp ../Ice/SslFactory.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../Ice/SslSystemOpenSSL.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslGeneralConfig.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h ../Ice/Security.h
SslGeneralConfig.o: SslGeneralConfig.cpp ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../Ice/SslFactory.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Properties.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslCertificateDesc.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
SslSystem.o: SslSystem.cpp ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h
-SslSystemOpenSSL.o: SslSystemOpenSSL.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/Security.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../../include/Ice/SecurityException.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/SslConfig.h ../../include/Ice/LoggerF.h ../Ice/SslCertificateDesc.h ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
+SslSystemOpenSSL.o: SslSystemOpenSSL.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../Ice/Security.h ../Ice/SslSystem.h ../Ice/SslConnection.h ../../include/Ice/Buffer.h ../../include/Ice/Config.h ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/Ice/Logger.h ../../include/Ice/Properties.h ../../include/Ice/SecurityException.h ../Ice/SslConnectionOpenSSLClient.h ../Ice/SslConnectionOpenSSL.h ../Ice/SslConnectionOpenSSLServer.h ../Ice/SslConfig.h ../../include/Ice/LoggerF.h ../Ice/SslCertificateDesc.h ../Ice/SslGeneralConfig.h ../Ice/SslSystemOpenSSL.h ../Ice/SslFactory.h ../Ice/SslCertificateAuthority.h ../Ice/SslBaseCerts.h ../Ice/SslTempCerts.h
SslTempCerts.o: SslTempCerts.cpp ../Ice/SslTempCerts.h ../Ice/SslCertificateDesc.h
UdpTransceiver.o: UdpTransceiver.cpp ../Ice/UdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalException.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/Ice/CommunicatorF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/ObjectFactoryManagerF.h ../Ice/UserExceptionFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/Buffer.h ../Ice/Network.h
diff --git a/cpp/src/Ice/Connection.cpp b/cpp/src/Ice/Connection.cpp
index 10a7cb63d22..a51985f77ad 100644
--- a/cpp/src/Ice/Connection.cpp
+++ b/cpp/src/Ice/Connection.cpp
@@ -78,7 +78,7 @@ IceInternal::Connection::destroy(DestructionReason reason)
bool
IceInternal::Connection::destroyed() const
{
- IceUtil::RecMutex::ConstLock sync(*this);
+ IceUtil::RecMutex::Lock sync(*this);
return _state >= StateClosing;
}
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 341252af3bd..4f8b7975f2c 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -136,7 +136,7 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
void
Ice::Object::__write(::IceInternal::BasicStream* __os) const
{
- IceUtil::Mutex::ConstLock sync(_activeFacetMapMutex);
+ IceUtil::Mutex::Lock sync(_activeFacetMapMutex);
__os->write(Int(_activeFacetMap.size()));
for (map<string, ObjectPtr>::const_iterator p = _activeFacetMap.begin(); p != _activeFacetMap.end(); ++p)
diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h
index cae11c9df97..4ab2edd7030 100644
--- a/cpp/src/IceStorm/Subscriber.h
+++ b/cpp/src/IceStorm/Subscriber.h
@@ -106,7 +106,7 @@ protected:
// Immutable
TraceLevelsPtr _traceLevels;
- mutable IceUtil::Mutex _stateMutex;
+ IceUtil::Mutex _stateMutex;
State _state;
private:
diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index 5e71fbdd887..45a4aa61872 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -239,7 +239,7 @@ private:
//
// Set of subscribers that encountered an error.
//
- mutable IceUtil::Mutex _errorMutex;
+ IceUtil::Mutex _errorMutex;
mutable SubscriberList _error;
};
@@ -513,7 +513,7 @@ TopicI::getLinkProxy(const Ice::Current&)
bool
TopicI::destroyed() const
{
- IceUtil::RecMutex::ConstLock sync(*this);
+ IceUtil::RecMutex::Lock sync(*this);
return _destroyed;
}
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index 439b1676c9c..807295d2441 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -31,7 +31,7 @@ IceUtil::Semaphore::~Semaphore()
}
bool
-IceUtil::Semaphore::wait(long timeout)
+IceUtil::Semaphore::wait(long timeout) const
{
if (timeout < 0)
{
@@ -46,7 +46,7 @@ IceUtil::Semaphore::wait(long timeout)
}
void
-IceUtil::Semaphore::post(int count)
+IceUtil::Semaphore::post(int count) const
{
int rc = ReleaseSemaphore(_sem, count, 0);
if (rc == 0)
@@ -114,7 +114,7 @@ IceUtil::Cond::wake(bool broadcast)
}
void
-IceUtil::Cond::preWait()
+IceUtil::Cond::preWait() const
{
_gate.wait();
_blocked++;
@@ -122,7 +122,7 @@ IceUtil::Cond::preWait()
}
void
-IceUtil::Cond::postWait(bool timedout)
+IceUtil::Cond::postWait(bool timedout) const
{
_internal.lock();
_unblocked++;
@@ -153,7 +153,7 @@ IceUtil::Cond::postWait(bool timedout)
}
bool
-IceUtil::Cond::dowait(long timeout)
+IceUtil::Cond::dowait(long timeout) const
{
try
{
diff --git a/cpp/src/IceUtil/RWRecMutex.cpp b/cpp/src/IceUtil/RWRecMutex.cpp
index 0137ca79668..dd87a1ae245 100644
--- a/cpp/src/IceUtil/RWRecMutex.cpp
+++ b/cpp/src/IceUtil/RWRecMutex.cpp
@@ -24,7 +24,7 @@ IceUtil::RWRecMutex::~RWRecMutex()
}
void
-IceUtil::RWRecMutex::readLock()
+IceUtil::RWRecMutex::readLock() const
{
Mutex::Lock lock(_mutex);
@@ -40,7 +40,7 @@ IceUtil::RWRecMutex::readLock()
}
void
-IceUtil::RWRecMutex::tryReadLock()
+IceUtil::RWRecMutex::tryReadLock() const
{
Mutex::Lock lock(_mutex);
@@ -56,7 +56,7 @@ IceUtil::RWRecMutex::tryReadLock()
}
void
-IceUtil::RWRecMutex::writeLock()
+IceUtil::RWRecMutex::writeLock() const
{
Mutex::Lock lock(_mutex);
@@ -86,7 +86,7 @@ IceUtil::RWRecMutex::writeLock()
}
void
-IceUtil::RWRecMutex::tryWriteLock()
+IceUtil::RWRecMutex::tryWriteLock() const
{
Mutex::Lock lock(_mutex);
@@ -105,7 +105,7 @@ IceUtil::RWRecMutex::tryWriteLock()
}
void
-IceUtil::RWRecMutex::unlock()
+IceUtil::RWRecMutex::unlock() const
{
bool ww;
bool wr;
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 91735b00c78..98775a5cc86 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -28,7 +28,7 @@ IceUtil::RecMutex::~RecMutex()
}
bool
-IceUtil::RecMutex::lock()
+IceUtil::RecMutex::lock() const
{
EnterCriticalSection(&_mutex);
if (++_count > 1)
@@ -40,7 +40,7 @@ IceUtil::RecMutex::lock()
}
bool
-IceUtil::RecMutex::trylock()
+IceUtil::RecMutex::trylock() const
{
if (!TryEnterCriticalSection(&_mutex))
{
@@ -55,7 +55,7 @@ IceUtil::RecMutex::trylock()
}
bool
-IceUtil::RecMutex::unlock()
+IceUtil::RecMutex::unlock() const
{
if (--_count == 0)
{
@@ -66,7 +66,7 @@ IceUtil::RecMutex::unlock()
}
void
-IceUtil::RecMutex::unlock(LockState& state)
+IceUtil::RecMutex::unlock(LockState& state) const
{
state.count = _count;
_count = 0;
@@ -74,7 +74,7 @@ IceUtil::RecMutex::unlock(LockState& state)
}
void
-IceUtil::RecMutex::lock(LockState& state)
+IceUtil::RecMutex::lock(LockState& state) const
{
EnterCriticalSection(&_mutex);
_count = state.count;
@@ -101,7 +101,7 @@ IceUtil::RecMutex::~RecMutex()
}
bool
-IceUtil::RecMutex::lock()
+IceUtil::RecMutex::lock() const
{
int rc = pthread_mutex_lock(&_mutex);
if (rc != 0)
@@ -118,7 +118,7 @@ IceUtil::RecMutex::lock()
}
bool
-IceUtil::RecMutex::trylock()
+IceUtil::RecMutex::trylock() const
{
int rc = pthread_mutex_trylock(&_mutex);
if (rc != 0)
@@ -139,7 +139,7 @@ IceUtil::RecMutex::trylock()
}
bool
-IceUtil::RecMutex::unlock()
+IceUtil::RecMutex::unlock() const
{
if (--_count == 0)
{
@@ -152,7 +152,7 @@ IceUtil::RecMutex::unlock()
}
void
-IceUtil::RecMutex::unlock(LockState& state)
+IceUtil::RecMutex::unlock(LockState& state) const
{
state.mutex = &_mutex;
state.count = _count;
@@ -160,7 +160,7 @@ IceUtil::RecMutex::unlock(LockState& state)
}
void
-IceUtil::RecMutex::lock(LockState& state)
+IceUtil::RecMutex::lock(LockState& state) const
{
_count = state.count;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 20:11:27 +0000