Skip to content

Commit 75c3f9f

Browse files
committed
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.
1 parent 8d9ee8e commit 75c3f9f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/sync.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class LOCKABLE AnnotatedMixin : public PARENT
111111
return PARENT::try_lock();
112112
}
113113

114-
using UniqueLock = std::unique_lock<PARENT>;
114+
using unique_lock = std::unique_lock<PARENT>;
115115
#ifdef __clang__
116116
//! For negative capabilities in the Clang Thread Safety Analysis.
117117
//! 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
149149

150150
/** Wrapper around std::unique_lock style lock for MutexType. */
151151
template <typename MutexType>
152-
class SCOPED_LOCKABLE UniqueLock : public MutexType::UniqueLock
152+
class SCOPED_LOCKABLE UniqueLock : public MutexType::unique_lock
153153
{
154154
private:
155-
using Base = typename MutexType::UniqueLock;
155+
using Base = typename MutexType::unique_lock;
156156

157157
void Enter(const char* pszName, const char* pszFile, int nLine)
158158
{

0 commit comments

Comments
 (0)