summaryrefslogtreecommitdiff
path: root/cpp/include/IceUtil/StaticMutex.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-05-16 15:38:25 +0000
committerBernard Normier <bernard@zeroc.com>2003-05-16 15:38:25 +0000
commitf80e2c27c6b4deb05e4e533092dd90dd449262d1 (patch)
treee1dc25bfe5c122976677b2a3bcfce6d1ab3683bd /cpp/include/IceUtil/StaticMutex.h
parentall timed function now return false on timeout instead of raising an (diff)
downloadice-f80e2c27c6b4deb05e4e533092dd90dd449262d1.tar.bz2
ice-f80e2c27c6b4deb05e4e533092dd90dd449262d1.tar.xz
ice-f80e2c27c6b4deb05e4e533092dd90dd449262d1.zip
Renamed trylock, readlock and writelock to tryLock, readLock and writeLock
Diffstat (limited to 'cpp/include/IceUtil/StaticMutex.h')
-rw-r--r--cpp/include/IceUtil/StaticMutex.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h
index 036bafd8d59..df16e103195 100644
--- a/cpp/include/IceUtil/StaticMutex.h
+++ b/cpp/include/IceUtil/StaticMutex.h
@@ -45,7 +45,7 @@ public:
typedef TryLockT<StaticMutex> TryLock;
//
- // Note that lock/trylock & unlock in general should not be used
+ // Note that lock/tryLock & unlock in general should not be used
// directly. Instead use Lock & TryLock.
//
@@ -54,7 +54,7 @@ public:
//
// Returns true if the lock was acquired, and false otherwise.
//
- bool trylock() const;
+ bool tryLock() const;
void unlock() const;
@@ -137,7 +137,7 @@ StaticMutex::lock() const
}
inline bool
-StaticMutex::trylock() const
+StaticMutex::tryLock() const
{
if (!_mutexInitialized)
{
@@ -193,7 +193,7 @@ StaticMutex::lock() const
}
inline bool
-StaticMutex::trylock() const
+StaticMutex::tryLock() const
{
int rc = pthread_mutex_trylock(&_mutex);
if(rc != 0 && rc != EBUSY)