From 96a8ecae502f9bf5f18c4e001638eecb1efb36d5 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 3 Oct 2022 18:17:00 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#26189: refactor: Do not discard `try_lock()` return value 30cc1c6609ad7868f73e88afe0b0233d395ec08c refactor: Drop `owns_lock()` call (Hennadii Stepanov) bff4e068b69edd40a00466156f860bde2df29268 refactor: Do not discard `try_lock()` return value (Hennadii Stepanov) Pull request description: 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: https://github.com/microsoft/STL/commit/539c26c923b38cd0b5eba2bb11de4bea9d5c6e43 Fixes bitcoin/bitcoin#26017. Split from bitcoin/bitcoin#25819. ACKs for top commit: vasild: ACK 30cc1c6609ad7868f73e88afe0b0233d395ec08c Tree-SHA512: ce17404e1c78af4f763129753caf8e5a0e1c91ba398778fe912f9fcc56a847e8112460d1a1a35bf905a593b7d8e0b16c6b099ad74976b67dca5f4f3eda6ff621 --- src/sync.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sync.h b/src/sync.h index aed8c697b5..78febe1e0a 100644 --- a/src/sync.h +++ b/src/sync.h @@ -149,10 +149,11 @@ private: bool TryEnter(const char* pszName, const char* pszFile, int nLine) { EnterCritical(pszName, pszFile, nLine, Base::mutex(), true); - Base::try_lock(); - if (!Base::owns_lock()) - LeaveCritical(); - return Base::owns_lock(); + if (Base::try_lock()) { + return true; + } + LeaveCritical(); + return false; } public: