highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Do not discard try_lock() return value

Browse Source 
Microsoft's C++ Standard Library uses the `[[nodiscard]]` attribute for
`try_lock()`.
See: https://github.com/microsoft/STL/blob/main/stl/inc/mutex

This change allows to drop the current suppression for the warning C4838
and helps to prevent the upcoming warning C4858.
See: 539c26c923
This commit is contained in:
Hennadii Stepanov
2022-08-10 23:18:45 +01:00
parent 9fcdb9f3a0
commit bff4e068b6
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sync.h
View File

@@ -165,8 +165,7 @@ private:
bool TryEnter(const char* pszName, const char* pszFile, int nLine) bool TryEnter(const char* pszName, const char* pszFile, int nLine)
{ {
EnterCritical(pszName, pszFile, nLine, Base::mutex(), true); EnterCritical(pszName, pszFile, nLine, Base::mutex(), true);
Base::try_lock(); if (!Base::try_lock()) {
if (!Base::owns_lock()) {
LeaveCritical(); LeaveCritical();
} }
return Base::owns_lock(); return Base::owns_lock();