Merge/collision fix.
Belonged in previous commit really.
This commit is contained in:
@@ -193,7 +193,6 @@ public:
|
|||||||
bool isSelfLocked() const;
|
bool isSelfLocked() const;
|
||||||
|
|
||||||
// get ID of locking thread
|
// get ID of locking thread
|
||||||
bool isSelfLocked(); //return true if locked in a same thread
|
|
||||||
U32 lockingThread() const { return mLockingThread; }
|
U32 lockingThread() const { return mLockingThread; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
Reference in New Issue
Block a user