highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-30 17:50:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

sync: rename AnnotatedMixin::UniqueLock to AnnotatedMixin::unique_lock

Browse Source 
This avoids confusion with the global `UniqueLock` and the snake case
is consistent with `UniqueLock::reverse_lock.
This commit is contained in:
Vasil Dimov 2022-10-10 09:10:14 +02:00
parent 8d9ee8efe8
commit 75c3f9f880
No known key found for this signature in database
GPG Key ID: 54DF06F64B55CBBF
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sync.h
View File

@ -111,7 +111,7 @@ public:
return PARENT::try_lock(); return PARENT::try_lock();
} }
using UniqueLock = std::unique_lock<PARENT>; using unique_lock = std::unique_lock<PARENT>;
#ifdef __clang__ #ifdef __clang__
//! For negative capabilities in the Clang Thread Safety Analysis. //! For negative capabilities in the Clang Thread Safety Analysis.
//! A negative requirement uses the EXCLUSIVE_LOCKS_REQUIRED attribute, in conjunction //! 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. */ /** Wrapper around std::unique_lock style lock for MutexType. */
template <typename MutexType> template <typename MutexType>
class SCOPED_LOCKABLE UniqueLock : public MutexType::UniqueLock class SCOPED_LOCKABLE UniqueLock : public MutexType::unique_lock
{ {
private: private:
using Base = typename MutexType::UniqueLock; using Base = typename MutexType::unique_lock;
void Enter(const char* pszName, const char* pszFile, int nLine) void Enter(const char* pszName, const char* pszFile, int nLine)
{ {