Author: kgiusti
Date: Tue Jul 2 13:26:12 2013
New Revision: 1498926
URL: http://svn.apache.org/r1498926
Log:
NO-JIRA: tweak code to allow better lock analysis by Coverity
Modified:
qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h
Modified: qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h?rev=1498926&r1=1498925&r2=1498926&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/Mutex.h Tue Jul 2 13:26:12 2013
@@ -30,7 +30,7 @@ template <class L>
class ScopedLock
{
public:
- ScopedLock(L& l) : mutex(l) { l.lock(); }
+ ScopedLock(L& l) : mutex(l) { mutex.lock(); }
~ScopedLock() { mutex.unlock(); }
private:
L& mutex;
@@ -40,7 +40,7 @@ template <class L>
class ScopedUnlock
{
public:
- ScopedUnlock(L& l) : mutex(l) { l.unlock(); }
+ ScopedUnlock(L& l) : mutex(l) { mutex.unlock(); }
~ScopedUnlock() { mutex.lock(); }
private:
L& mutex;
@@ -50,7 +50,7 @@ template <class L>
class ScopedRlock
{
public:
- ScopedRlock(L& l) : mutex(l) { l.rlock(); }
+ ScopedRlock(L& l) : mutex(l) { mutex.rlock(); }
~ScopedRlock() { mutex.unlock(); }
private:
L& mutex;
@@ -60,7 +60,7 @@ template <class L>
class ScopedWlock
{
public:
- ScopedWlock(L& l) : mutex(l) { l.wlock(); }
+ ScopedWlock(L& l) : mutex(l) { mutex.wlock(); }
~ScopedWlock() { mutex.unlock(); }
private:
L& mutex;
@@ -70,7 +70,7 @@ template <class L>
class ConditionalScopedLock
{
public:
- ConditionalScopedLock(L& l) : mutex(l) { acquired = l.trylock(); }
+ ConditionalScopedLock(L& l) : mutex(l) { acquired = mutex.trylock(); }
~ConditionalScopedLock() { if (acquired) mutex.unlock(); }
bool lockAcquired() { return acquired; }
private:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
