Author: cctrieloff
Date: Mon Jun 2 17:55:43 2008
New Revision: 662613
URL: http://svn.apache.org/viewvc?rev=662613&view=rev
Log:
QPID-1108 patch from Manuel Teira
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h?rev=662613&r1=662612&r2=662613&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/posix/Mutex.h Mon Jun 2
17:55:43 2008
@@ -79,7 +79,6 @@
*/
namespace {
pthread_once_t onceControl = PTHREAD_ONCE_INIT;
- pthread_rwlockattr_t rwlockattr;
pthread_mutexattr_t mutexattr;
void initMutexattr() {
@@ -87,10 +86,6 @@
pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_RECURSIVE);
}
- void initRWlockattr() {
- pthread_rwlockattr_init(&rwlockattr);
- }
-
struct RecursiveMutexattr {
RecursiveMutexattr() {
pthread_once(&onceControl, initMutexattr);
@@ -100,21 +95,8 @@
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 @@
RWlock::RWlock() {
- QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_init(&rwlock,
recursiveRWlockattr));
+ QPID_POSIX_ASSERT_THROW_IF(pthread_rwlock_init(&rwlock, NULL));
}
RWlock::~RWlock(){
