i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added operator=().

Browse Source 
* Style cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30740 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-05-13 07:46:14 +00:00
parent a243916712
commit 49dcde5cf5
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/shared/AutoLocker.h
+21 -13
View File
@@ -15,12 +15,12 @@ namespace BPrivate {
template<typename Lockable> template<typename Lockable>
class AutoLockerStandardLocking { class AutoLockerStandardLocking {
public: public:
inline bool Lock(Lockable *lockable) inline bool Lock(Lockable* lockable)
{ {
return lockable->Lock(); return lockable->Lock();
} }
inline void Unlock(Lockable *lockable) inline void Unlock(Lockable* lockable)
{ {
lockable->Unlock(); lockable->Unlock();
} }
@@ -30,12 +30,12 @@ public:
template<typename Lockable> template<typename Lockable>
class AutoLockerReadLocking { class AutoLockerReadLocking {
public: public:
inline bool Lock(Lockable *lockable) inline bool Lock(Lockable* lockable)
{ {
return lockable->ReadLock(); return lockable->ReadLock();
} }
inline void Unlock(Lockable *lockable) inline void Unlock(Lockable* lockable)
{ {
lockable->ReadUnlock(); lockable->ReadUnlock();
} }
@@ -45,12 +45,12 @@ public:
template<typename Lockable> template<typename Lockable>
class AutoLockerWriteLocking { class AutoLockerWriteLocking {
public: public:
inline bool Lock(Lockable *lockable) inline bool Lock(Lockable* lockable)
{ {
return lockable->WriteLock(); return lockable->WriteLock();
} }
inline void Unlock(Lockable *lockable) inline void Unlock(Lockable* lockable)
{ {
lockable->WriteUnlock(); lockable->WriteUnlock();
} }
@@ -78,7 +78,7 @@ public:
{ {
} }
inline AutoLocker(Lockable *lockable, bool alreadyLocked = false, inline AutoLocker(Lockable* lockable, bool alreadyLocked = false,
bool lockIfNotLocked = true) bool lockIfNotLocked = true)
: :
fLockable(lockable), fLockable(lockable),
@@ -88,7 +88,7 @@ public:
Lock(); Lock();
} }
inline AutoLocker(Lockable &lockable, bool alreadyLocked = false, inline AutoLocker(Lockable& lockable, bool alreadyLocked = false,
bool lockIfNotLocked = true) bool lockIfNotLocked = true)
: :
fLockable(&lockable), fLockable(&lockable),
@@ -103,7 +103,7 @@ public:
Unlock(); Unlock();
} }
inline void SetTo(Lockable *lockable, bool alreadyLocked, inline void SetTo(Lockable* lockable, bool alreadyLocked,
bool lockIfNotLocked = true) bool lockIfNotLocked = true)
{ {
Unlock(); Unlock();
@@ -113,7 +113,7 @@ public:
Lock(); Lock();
} }
inline void SetTo(Lockable &lockable, bool alreadyLocked, inline void SetTo(Lockable& lockable, bool alreadyLocked,
bool lockIfNotLocked = true) bool lockIfNotLocked = true)
{ {
SetTo(&lockable, alreadyLocked, lockIfNotLocked); SetTo(&lockable, alreadyLocked, lockIfNotLocked);
@@ -146,24 +146,32 @@ public:
fLocked = false; fLocked = false;
} }
inline AutoLocker<Lockable, Locking> &operator=(Lockable *lockable) inline AutoLocker<Lockable, Locking>& operator=(Lockable* lockable)
{ {
SetTo(lockable); SetTo(lockable);
return *this; return *this;
} }
inline AutoLocker<Lockable, Locking> &operator=(Lockable &lockable) inline AutoLocker<Lockable, Locking>& operator=(Lockable& lockable)
{ {
SetTo(&lockable); SetTo(&lockable);
return *this; return *this;
} }
inline ThisClass& operator=(ThisClass& otherLocker)
{
fLockable = otherLocker.fLockable;
fLocked = otherLocker.fLocked;
otherLocker.Detach();
return &this;
}
inline bool IsLocked() const { return fLocked; } inline bool IsLocked() const { return fLocked; }
inline operator bool() const { return fLocked; } inline operator bool() const { return fLocked; }
protected: protected:
Lockable *fLockable; Lockable* fLockable;
Locking fLocking; Locking fLocking;
bool fLocked; bool fLocked;
}; };