@@ -147,12 +147,12 @@ inline void AssertLockNotHeldInline(const char* name, const char* file, int line
147
147
inline void AssertLockNotHeldInline (const char * name, const char * file, int line, GlobalMutex* cs) LOCKS_EXCLUDED(cs) { AssertLockNotHeldInternal (name, file, line, cs); }
148
148
#define AssertLockNotHeld (cs ) AssertLockNotHeldInline(#cs, __FILE__, __LINE__, &cs)
149
149
150
- /* * Wrapper around std::unique_lock style lock for Mutex . */
151
- template <typename Mutex >
152
- class SCOPED_LOCKABLE UniqueLock : public Mutex ::UniqueLock
150
+ /* * Wrapper around std::unique_lock style lock for MutexType . */
151
+ template <typename MutexType >
152
+ class SCOPED_LOCKABLE UniqueLock : public MutexType ::UniqueLock
153
153
{
154
154
private:
155
- using Base = typename Mutex ::UniqueLock;
155
+ using Base = typename MutexType ::UniqueLock;
156
156
157
157
void Enter (const char * pszName, const char * pszFile, int nLine)
158
158
{
@@ -175,15 +175,15 @@ class SCOPED_LOCKABLE UniqueLock : public Mutex::UniqueLock
175
175
}
176
176
177
177
public:
178
- UniqueLock (Mutex & mutexIn, const char * pszName, const char * pszFile, int nLine, bool fTry = false ) EXCLUSIVE_LOCK_FUNCTION(mutexIn) : Base(mutexIn, std::defer_lock)
178
+ UniqueLock (MutexType & mutexIn, const char * pszName, const char * pszFile, int nLine, bool fTry = false ) EXCLUSIVE_LOCK_FUNCTION(mutexIn) : Base(mutexIn, std::defer_lock)
179
179
{
180
180
if (fTry )
181
181
TryEnter (pszName, pszFile, nLine);
182
182
else
183
183
Enter (pszName, pszFile, nLine);
184
184
}
185
185
186
- UniqueLock (Mutex * pmutexIn, const char * pszName, const char * pszFile, int nLine, bool fTry = false ) EXCLUSIVE_LOCK_FUNCTION(pmutexIn)
186
+ UniqueLock (MutexType * pmutexIn, const char * pszName, const char * pszFile, int nLine, bool fTry = false ) EXCLUSIVE_LOCK_FUNCTION(pmutexIn)
187
187
{
188
188
if (!pmutexIn) return ;
189
189
0 commit comments