From 925b9f890ac1fe5bd6657975f2f20ad13624f3ef Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 28 Jan 2021 16:40:07 +0200 Subject: [PATCH] do not define ATOMIC_INT_LOCK_FREE and ATOMIC_POINTER_LOCK_FREE if not defined Signed-off-by: Ivailo Monev --- src/core/thread/qatomic.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/core/thread/qatomic.h b/src/core/thread/qatomic.h index 9d744ef1b..0c0ad7979 100644 --- a/src/core/thread/qatomic.h +++ b/src/core/thread/qatomic.h @@ -42,14 +42,6 @@ #include #include -#ifndef ATOMIC_INT_LOCK_FREE -#define ATOMIC_INT_LOCK_FREE 0 -#endif - -#ifndef ATOMIC_POINTER_LOCK_FREE -#define ATOMIC_POINTER_LOCK_FREE 0 -#endif - QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QAtomicInt @@ -151,7 +143,11 @@ class Q_CORE_EXPORT QAtomicInt { return load(); } inline static bool isLockFree() { +#ifdef ATOMIC_INT_LOCK_FREE return ATOMIC_INT_LOCK_FREE == 2; +#else + return false; +#endif } private: @@ -249,7 +245,11 @@ class Q_CORE_EXPORT QAtomicPointer { return load(); } inline static bool isLockFree() { +#ifdef ATOMIC_POINTER_LOCK_FREE return ATOMIC_POINTER_LOCK_FREE == 2; +#else + return false; +#endif } private: -- 2.11.0