From cc2588579c3fbc133a7ca762fa213ca18b736551 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Thu, 16 May 2019 11:25:31 +0200 Subject: Move LockAnnotation from threadsafety.h (imported code) to sync.h (our code) --- src/sync.h | 11 +++++++++++ src/threadsafety.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/sync.h b/src/sync.h index 2667fb52f9..a4c22f67cc 100644 --- a/src/sync.h +++ b/src/sync.h @@ -304,4 +304,15 @@ public: } }; +// Utility class for indicating to compiler thread analysis that a mutex is +// locked (when it couldn't be determined otherwise). +struct SCOPED_LOCKABLE LockAnnotation +{ + template + explicit LockAnnotation(Mutex& mutex) EXCLUSIVE_LOCK_FUNCTION(mutex) + { + } + ~LockAnnotation() UNLOCK_FUNCTION() {} +}; + #endif // BITCOIN_SYNC_H diff --git a/src/threadsafety.h b/src/threadsafety.h index 33acddc65c..47e6b2ea38 100644 --- a/src/threadsafety.h +++ b/src/threadsafety.h @@ -54,15 +54,4 @@ #define ASSERT_EXCLUSIVE_LOCK(...) #endif // __GNUC__ -// Utility class for indicating to compiler thread analysis that a mutex is -// locked (when it couldn't be determined otherwise). -struct SCOPED_LOCKABLE LockAnnotation -{ - template - explicit LockAnnotation(Mutex& mutex) EXCLUSIVE_LOCK_FUNCTION(mutex) - { - } - ~LockAnnotation() UNLOCK_FUNCTION() {} -}; - #endif // BITCOIN_THREADSAFETY_H -- cgit v1.2.3