From 75c3f9f8806259ac7ac02e725d2f2f48e5a1d954 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Mon, 10 Oct 2022 09:10:14 +0200
Subject: [PATCH] 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.
---
 src/sync.h | 6 +++---
 1 file 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)
     {