This commit is contained in:
JoelKatz
2011-12-30 23:16:07 -08:00
parent 812df57fcf
commit ecd63370f6

View File

@@ -38,15 +38,33 @@ public:
ScopedLock &operator=(const ScopedLock &sl) ScopedLock &operator=(const ScopedLock &sl)
{ // we inherit any lock the other class member had { // we inherit any lock the other class member had
if(mMutex!=sl.mMutex)
{
if(mValid) mMutex->unlock(); if(mValid) mMutex->unlock();
mMutex=sl.mMutex; mMutex=sl.mMutex;
if(sl.mValid) mMutex->lock();
{
mValid=true; mValid=true;
sl.mValid=false;
} }
return *this; return *this;
} }
void unlock(void)
{
if(mValid)
{
mMutex->unlock();
mValid=false;
}
}
void lock(void)
{
if(mValid)
{
mMutex->lock();
mValid=true;
}
}
}; };
#endif #endif