diff options
| author | Carl C. Trieloff <cctrieloff@apache.org> | 2008-06-03 00:55:43 +0000 |
|---|---|---|
| committer | Carl C. Trieloff <cctrieloff@apache.org> | 2008-06-03 00:55:43 +0000 |
| commit | a7044d1147e21475fc23ae0f6ab7473e7d01137e (patch) | |
| tree | 6b9c61afcbc797b0f539f6e8f2fabd7a2d57eaaa /qpid/cpp/src | |
| parent | e3ec9422951be06c11ca285b75675cec9c8369f6 (diff) | |
| download | qpid-python-a7044d1147e21475fc23ae0f6ab7473e7d01137e.tar.gz | |
QPID-1108 patch from Manuel Teira
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662613 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/sys/posix/Mutex.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/qpid/cpp/src/qpid/sys/posix/Mutex.h b/qpid/cpp/src/qpid/sys/posix/Mutex.h index ceb2794abe..9414f39d8f 100644 --- a/qpid/cpp/src/qpid/sys/posix/Mutex.h +++ b/qpid/cpp/src/qpid/sys/posix/Mutex.h @@ -79,7 +79,6 @@ protected: */ namespace { pthread_once_t onceControl = PTHREAD_ONCE_INIT; - pthread_rwlockattr_t rwlockattr; pthread_mutexattr_t mutexattr; void initMutexattr() { @@ -87,10 +86,6 @@ namespace { pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE); } - void initRWlockattr() { - pthread_rwlockattr_init(&rwlockattr); - } - struct RecursiveMutexattr { RecursiveMutexattr() { pthread_once(&onceControl, initMutexattr); @@ -100,21 +95,8 @@ namespace { return &mutexattr; } }; - struct RecursiveRWlockattr { - RecursiveRWlockattr() { - pthread_once(&onceControl, initRWlockattr); - } - - operator const pthread_rwlockattr_t*() const { - return &rwlockattr; - } - }; - + RecursiveMutexattr recursiveMutexattr; - RecursiveRWlockattr recursiveRWlockattr; - - - } /** @@ -169,7 +151,7 @@ bool Mutex::trylock() { RWlock::RWlock() { - QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_init(&rwlock, recursiveRWlockattr)); + QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_init(&rwlock, NULL)); } RWlock::~RWlock(){ |