diff options
| author | Wladimir J. van der Laan <[email protected]> | 2018-08-31 17:23:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2018-08-31 17:33:21 +0200 |
| commit | 59ecacfc84af13e5a1608e7d970315d07dcb0269 (patch) | |
| tree | aeece6f0d62abfa11a70875d120350f0374cabee /src/test | |
| parent | Merge #11640: Make LOCK, LOCK2, TRY_LOCK work with CWaitableCriticalSection (diff) | |
| parent | scripted-diff: Small locking rename (diff) | |
| download | discoin-59ecacfc84af13e5a1608e7d970315d07dcb0269.tar.xz discoin-59ecacfc84af13e5a1608e7d970315d07dcb0269.zip | |
Merge #11599: scripted-diff: Small locking rename
190bf62be1214b072513c7fd7e01cc191723967c scripted-diff: Small locking rename (Russell Yanofsky)
Pull request description:
Call sync.h primitives "locks" and "mutexes" instead of "blocks" and "waitable critical sections" to match current coding conventions and c++11 standard names.
This PR does not rename the "CCriticalSection" class (though this could be done as a followup) because it's used everywhere and would swamp the other changes in this PR. Plain mutexes should mostly be preferred instead of recursive mutexes in new code anyway.
Tree-SHA512: 39b5b2be8f7a98227be8ab0648bdbb1b620944659bdc1eb9a15b0fcc0c930457fa0c03170cfedaeee0007ea716c526b31a8d84a86dd2333ce9d8bfabd773fe45
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/sync_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/sync_tests.cpp b/src/test/sync_tests.cpp index 539e2ff3a..df0380546 100644 --- a/src/test/sync_tests.cpp +++ b/src/test/sync_tests.cpp @@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(potential_deadlock_detected) CCriticalSection rmutex1, rmutex2; TestPotentialDeadLockDetected(rmutex1, rmutex2); - CWaitableCriticalSection mutex1, mutex2; + Mutex mutex1, mutex2; TestPotentialDeadLockDetected(mutex1, mutex2); #ifdef DEBUG_LOCKORDER |