diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-07-18 19:47:14 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-07-18 19:47:14 +0000 |
| commit | 3c02842b6143c6ce9297feecd7c9497312c76da8 (patch) | |
| tree | 478210bed985772e2957ee0a65b9cd3f5f390234 /cpp/include/IceUtil/StaticMutex.h | |
| parent | use lazy initialization of communicator for each request (diff) | |
| download | ice-3c02842b6143c6ce9297feecd7c9497312c76da8.tar.bz2 ice-3c02842b6143c6ce9297feecd7c9497312c76da8.tar.xz ice-3c02842b6143c6ce9297feecd7c9497312c76da8.zip | |
Major Freeze update
Diffstat (limited to 'cpp/include/IceUtil/StaticMutex.h')
| -rw-r--r-- | cpp/include/IceUtil/StaticMutex.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h index df16e103195..c36a6c72a0c 100644 --- a/cpp/include/IceUtil/StaticMutex.h +++ b/cpp/include/IceUtil/StaticMutex.h @@ -60,8 +60,8 @@ public: #ifdef _WIN32 - mutable bool _mutexInitialized; - mutable CRITICAL_SECTION _mutex; + mutable bool _mutexInitialized; + mutable CRITICAL_SECTION* _mutex; #else mutable pthread_mutex_t _mutex; #endif @@ -128,12 +128,12 @@ StaticMutex::lock() const { initialize(); } - EnterCriticalSection(&_mutex); + EnterCriticalSection(_mutex); // // If necessary this can be removed and replaced with a _count // member (like the UNIX implementation of RecStaticMutex). // - assert(_mutex.RecursionCount == 1); + assert(_mutex->RecursionCount == 1); } inline bool @@ -143,13 +143,13 @@ StaticMutex::tryLock() const { initialize(); } - if(!TryEnterCriticalSection(&_mutex)) + if(!TryEnterCriticalSection(_mutex)) { return false; } - if(_mutex.RecursionCount > 1) + if(_mutex->RecursionCount > 1) { - LeaveCriticalSection(&_mutex); + LeaveCriticalSection(_mutex); return false; } return true; @@ -159,15 +159,15 @@ inline void StaticMutex::unlock() const { assert(_mutexInitialized); - assert(_mutex.RecursionCount == 1); - LeaveCriticalSection(&_mutex); + assert(_mutex->RecursionCount == 1); + LeaveCriticalSection(_mutex); } inline void StaticMutex::unlock(LockState& state) const { assert(_mutexInitialized); - LeaveCriticalSection(&_mutex); + LeaveCriticalSection(_mutex); } inline void @@ -177,7 +177,7 @@ StaticMutex::lock(LockState&) const { initialize(); } - EnterCriticalSection(&_mutex); + EnterCriticalSection(_mutex); } #else |