diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2022-10-10 09:10:14 +0200 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2022-10-10 09:20:59 +0200 |
| commit | 75c3f9f8806259ac7ac02e725d2f2f48e5a1d954 (patch) | |
| tree | d25bdc163efd70227713c976fb1f15937c68f1af | |
| parent | 8d9ee8efe80edeb04824b0daee236ed1a3f53a87 (diff) | |
| download | bitcoin-75c3f9f8806259ac7ac02e725d2f2f48e5a1d954.tar.xz | |
sync: rename AnnotatedMixin::UniqueLock to AnnotatedMixin::unique_lock
This avoids confusion with the global `UniqueLock` and the snake case
is consistent with `UniqueLock::reverse_lock.
| -rw-r--r-- | src/sync.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sync.h b/src/sync.h index 4956bc6837..463f25489c 100644 --- a/src/sync.h +++ b/src/sync.h @@ -111,7 +111,7 @@ public: return PARENT::try_lock(); } - using UniqueLock = std::unique_lock<PARENT>; + using unique_lock = std::unique_lock<PARENT>; #ifdef __clang__ //! For negative capabilities in the Clang Thread Safety Analysis. //! A negative requirement uses the EXCLUSIVE_LOCKS_REQUIRED attribute, in conjunction @@ -149,10 +149,10 @@ inline void AssertLockNotHeldInline(const char* name, const char* file, int line /** Wrapper around std::unique_lock style lock for MutexType. */ template <typename MutexType> -class SCOPED_LOCKABLE UniqueLock : public MutexType::UniqueLock +class SCOPED_LOCKABLE UniqueLock : public MutexType::unique_lock { private: - using Base = typename MutexType::UniqueLock; + using Base = typename MutexType::unique_lock; void Enter(const char* pszName, const char* pszFile, int nLine) { |