diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2019-01-16 05:58:48 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-01-16 07:49:13 +0100 |
commit | 03d28dde1635e36508cff1f9eabc265cdb5febb9 (patch) | |
tree | ee62d5851315c7b4c2c3c05f8a72e29a6dd4a1e8 /logic | |
parent | f8faca0abecafd6e65d07bd0fdd618070114cdfa (diff) |
compat/mutex: remove
Always use the adaptive QMutex.
Diffstat (limited to 'logic')
-rw-r--r-- | logic/pipeline.cpp | 6 | ||||
-rw-r--r-- | logic/pipeline.hpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp index 67669732..c355bf19 100644 --- a/logic/pipeline.cpp +++ b/logic/pipeline.cpp @@ -601,7 +601,7 @@ void pipeline::toggle_enabled() { b.negate(f_enabled_p); } void bits::set(bit_flags flag, bool val) { - spinlock_guard l(lock); + QMutexLocker l(&lock); flags &= ~flag; if (val) @@ -610,14 +610,14 @@ void bits::set(bit_flags flag, bool val) void bits::negate(bit_flags flag) { - spinlock_guard l(lock); + QMutexLocker l(&lock); flags ^= flag; } bool bits::get(bit_flags flag) { - spinlock_guard l(lock); + QMutexLocker l(&lock); return !!(flags & flag); } diff --git a/logic/pipeline.hpp b/logic/pipeline.hpp index 40088a5d..545a7836 100644 --- a/logic/pipeline.hpp +++ b/logic/pipeline.hpp @@ -7,7 +7,6 @@ #include "mappings.hpp" #include "compat/euler.hpp" #include "compat/enum-operators.hpp" -#include "compat/spinlock.hpp" #include "runtime-libraries.hpp" #include "extensions.hpp" @@ -70,7 +69,7 @@ enum bit_flags : unsigned { struct OTR_LOGIC_EXPORT bits { bit_flags flags{0}; - std::atomic_flag lock = ATOMIC_FLAG_INIT; + QMutex lock; void set(bit_flags flag, bool val); void negate(bit_flags flag); |