aboutsummaryrefslogtreecommitdiff
path: root/src/sync.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/sync.h')
-rw-r--r--src/sync.h48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/sync.h b/src/sync.h
index b8cb84f79f..c9a950799e 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -46,30 +46,6 @@ LEAVE_CRITICAL_SECTION(mutex); // no RAII
// //
///////////////////////////////
-/**
- * Template mixin that adds -Wthread-safety locking
- * annotations to a subset of the mutex API.
- */
-template <typename PARENT>
-class LOCKABLE AnnotatedMixin : public PARENT
-{
-public:
- void lock() EXCLUSIVE_LOCK_FUNCTION()
- {
- PARENT::lock();
- }
-
- void unlock() UNLOCK_FUNCTION()
- {
- PARENT::unlock();
- }
-
- bool try_lock() EXCLUSIVE_TRYLOCK_FUNCTION(true)
- {
- return PARENT::try_lock();
- }
-};
-
#ifdef DEBUG_LOCKORDER
void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false);
void LeaveCritical();
@@ -95,6 +71,30 @@ void static inline DeleteLock(void* cs) {}
#define AssertLockNotHeld(cs) AssertLockNotHeldInternal(#cs, __FILE__, __LINE__, &cs)
/**
+ * Template mixin that adds -Wthread-safety locking
+ * annotations to a subset of the mutex API.
+ */
+template <typename PARENT>
+class LOCKABLE AnnotatedMixin : public PARENT
+{
+public:
+ void lock() EXCLUSIVE_LOCK_FUNCTION()
+ {
+ PARENT::lock();
+ }
+
+ void unlock() UNLOCK_FUNCTION()
+ {
+ PARENT::unlock();
+ }
+
+ bool try_lock() EXCLUSIVE_TRYLOCK_FUNCTION(true)
+ {
+ return PARENT::try_lock();
+ }
+};
+
+/**
* Wrapped mutex: supports recursive locking, but no waiting
* TODO: We should move away from using the recursive lock by default.
*/