diff options
Diffstat (limited to 'src/corelib/arch/qatomic_unix.h')
| -rw-r--r-- | src/corelib/arch/qatomic_unix.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/arch/qatomic_unix.h b/src/corelib/arch/qatomic_unix.h index 3450596173..8c74e6eb7c 100644 --- a/src/corelib/arch/qatomic_unix.h +++ b/src/corelib/arch/qatomic_unix.h @@ -76,8 +76,8 @@ struct QAtomicOps<int> : QGenericAtomicOps<QAtomicOps<int> > { typedef int Type; - static inline bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } - static inline bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } Q_CORE_EXPORT static bool testAndSetRelaxed(int &_q_value, int expectedValue, int newValue) Q_DECL_NOTHROW; }; @@ -86,8 +86,8 @@ struct QAtomicOps<void *> : QGenericAtomicOps<QAtomicOps<void *> > { typedef void *Type; - static inline bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } - static inline bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } Q_CORE_EXPORT static bool testAndSetRelaxed(void *&_q_value, void *expectedValue, void *newValue) Q_DECL_NOTHROW; }; @@ -99,8 +99,8 @@ struct QAtomicOps<T *> : QGenericAtomicOps<QAtomicOps<T *> > // helper to strip cv qualifiers static inline void *nocv(const T *p) { return const_cast<void *>(static_cast<const volatile void *>(p)); } - static inline bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } - static inline bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } static inline bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) Q_DECL_NOTHROW { // forward to the void* specialization |