File dash-core-try_lock.patch of Package dash-core

Overview Repositories Revisions Requests Users Attributes Meta

File dash-core-try_lock.patch of Package dash-core (Revision 94be98be5d01c458df613b39fd65e67a)

Currently displaying revision 94be98be5d01c458df613b39fd65e67a , Show latest

From 742e5b37a53cdec690a5e1d522c4a72b3208e3de Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 10 Aug 2022 23:18:45 +0100
Subject: [PATCH] refactor: Do not discard `try_lock()` return value

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
---
 src/sync.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/sync.h b/src/sync.h
index be707c48b8..c7fee589f8 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -148,8 +148,7 @@ private:
     bool TryEnter(const char* pszName, const char* pszFile, int nLine)
     {
         EnterCritical(pszName, pszFile, nLine, (void*)(Base::mutex()), true);
-        Base::try_lock();
-        if (!Base::owns_lock())
+        if (!Base::try_lock())
             LeaveCritical();
         return Base::owns_lock();
     }
-- 
2.41.0

Places

File dash-core-try_lock.patch of Package dash-core (Revision 94be98be5d01c458df613b39fd65e67a)

Places