summaryrefslogtreecommitdiff
path: root/cpp/include/IceUtil/Lock.h
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2001-12-31 14:27:22 +0000
committerMatthew Newhook <matthew@zeroc.com>2001-12-31 14:27:22 +0000
commitb51bb7c6bd2f50932219e96573939cef1f5c018c (patch)
tree45ca849effd41e325369ad2bf288476efba8bb52 /cpp/include/IceUtil/Lock.h
parentinitial server support; align with stable_31 (diff)
downloadice-b51bb7c6bd2f50932219e96573939cef1f5c018c.tar.bz2
ice-b51bb7c6bd2f50932219e96573939cef1f5c018c.tar.xz
ice-b51bb7c6bd2f50932219e96573939cef1f5c018c.zip
Remove ConstLock, and friends.
Diffstat (limited to 'cpp/include/IceUtil/Lock.h')
-rw-r--r--cpp/include/IceUtil/Lock.h58
1 files changed, 4 insertions, 54 deletions
diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h
index 4fb921c8a66..d5b9d2ca14b 100644
--- a/cpp/include/IceUtil/Lock.h
+++ b/cpp/include/IceUtil/Lock.h
@@ -26,7 +26,7 @@ class Lock
{
public:
- Lock(T& mutex) :
+ Lock(const T& mutex) :
_mutex(mutex)
{
_mutex.lock();
@@ -39,7 +39,7 @@ public:
private:
- T& _mutex;
+ const T& _mutex;
friend class Cond;
};
@@ -49,7 +49,7 @@ class TryLock
{
public:
- TryLock(T& mutex) :
+ TryLock(const T& mutex) :
_mutex(mutex)
{
_mutex.trylock();
@@ -62,57 +62,7 @@ public:
private:
- T& _mutex;
-
- friend class Cond;
-};
-
-//
-// This is for use when a class derives from Mutex, Monitor or
-// RecMutex. Otherwise declare the concurrency primitive mutable.
-//
-template <typename T>
-class ConstLock
-{
-public:
-
- ConstLock(const T& mutex) :
- _mutex(const_cast<T&>(mutex))
- {
- _mutex.lock();
- }
-
- ~ConstLock()
- {
- _mutex.unlock();
- }
-
-private:
-
- T& _mutex;
-
- friend class Cond;
-};
-
-template <typename T>
-class ConstTryLock
-{
-public:
-
- ConstTryLock(const T& mutex) :
- _mutex(const_cast<T>(mutex))
- {
- _mutex.trylock();
- }
-
- ~ConstTryLock()
- {
- _mutex.unlock();
- }
-
-private:
-
- T& _mutex;
+ const T& _mutex;
friend class Cond;
};