summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch/qatomic_cxx11.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-07-31 12:17:09 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:37:23 +0000
commitacf75d733708f2275cc363566c2457f5c4486362 (patch)
tree49e8a60b66d14a88e8abb42640845f9dcefb2b0a /src/corelib/arch/qatomic_cxx11.h
parenta3b5020a1aee9f8d505b82ba70700518e5786686 (diff)
configure: standardize handling of 64 bit atomics
replace the custom QT_NO_STD_ATOMIC64 with a regular public feature, and give libatomic an empty source rather than using a separate config test. Change-Id: Iaf4a7f4c4874f61bf93aa58fe41843a86baf1ab7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/arch/qatomic_cxx11.h')
-rw-r--r--src/corelib/arch/qatomic_cxx11.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h
index 484ec73e7f..1404849382 100644
--- a/src/corelib/arch/qatomic_cxx11.h
+++ b/src/corelib/arch/qatomic_cxx11.h
@@ -187,7 +187,7 @@ template <> Q_DECL_CONSTEXPR inline bool QAtomicTraits<2>::isLockFree()
{ return false; }
#endif
-#ifndef QT_NO_STD_ATOMIC64
+#if QT_CONFIG(std_atomic64)
template<> struct QAtomicOpsSupport<8> { enum { IsSupported = 1 }; };
# define Q_ATOMIC_INT64_IS_SUPPORTED
# if ATOMIC_LLONG_LOCK_FREE == 2