Merge [57953] to release. Fixes #2681.

[SVN r58065]
This commit is contained in:
Peter Dimov
2009-11-30 20:25:01 +00:00
parent 2f8945a885
commit f040bed751

View File

@ -17,6 +17,7 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
#include <boost/assert.hpp>
#include <pthread.h> #include <pthread.h>
namespace boost namespace boost
@ -42,15 +43,15 @@ public:
// HPUX 10.20 / DCE has a nonstandard pthread_mutex_init // HPUX 10.20 / DCE has a nonstandard pthread_mutex_init
#if defined(__hpux) && defined(_DECTHREADS_) #if defined(__hpux) && defined(_DECTHREADS_)
pthread_mutex_init(&m_, pthread_mutexattr_default); BOOST_VERIFY( pthread_mutex_init( &m_, pthread_mutexattr_default ) == 0 );
#else #else
pthread_mutex_init(&m_, 0); BOOST_VERIFY( pthread_mutex_init( &m_, 0 ) == 0 );
#endif #endif
} }
~lightweight_mutex() ~lightweight_mutex()
{ {
pthread_mutex_destroy(&m_); BOOST_VERIFY( pthread_mutex_destroy( &m_ ) == 0 );
} }
class scoped_lock; class scoped_lock;
@ -69,12 +70,12 @@ public:
scoped_lock(lightweight_mutex & m): m_(m.m_) scoped_lock(lightweight_mutex & m): m_(m.m_)
{ {
pthread_mutex_lock(&m_); BOOST_VERIFY( pthread_mutex_lock( &m_ ) == 0 );
} }
~scoped_lock() ~scoped_lock()
{ {
pthread_mutex_unlock(&m_); BOOST_VERIFY( pthread_mutex_unlock( &m_ ) == 0 );
} }
}; };
}; };