diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 13:24:46 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 21:28:11 +0100 |
commit | 34304e3100883187ca658b8c983af21549496b43 (patch) | |
tree | 5c2e8216740e4ad4e9efc6010539c3a6cfbbbf8e /tests/auto/corelib/thread | |
parent | 1e9dc3ec2f254c711149f8c0376f0403df9b4650 (diff) |
Get rid of Q_COMPILER_CONSTEXPR checks
Is required now.
Change-Id: I62e95929d1649ea1390392230b619bd56d2a0349
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/thread')
-rw-r--r-- | tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp | 7 | ||||
-rw-r--r-- | tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp index db9839d1ed..14d393aede 100644 --- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp +++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp @@ -154,18 +154,11 @@ template <bool> inline void booleanHelper() template <typename Atomic> static void constexprFunctionsHelperTemplate() { -#ifdef Q_COMPILER_CONSTEXPR // this is a compile-time test only booleanHelper<Atomic::isReferenceCountingWaitFree()>(); booleanHelper<Atomic::isTestAndSetWaitFree()>(); booleanHelper<Atomic::isFetchAndStoreWaitFree()>(); booleanHelper<Atomic::isFetchAndAddWaitFree()>(); -#elif 0 // No longer constexpr - booleanHelper<Atomic::isReferenceCountingNative()>(); - booleanHelper<Atomic::isTestAndSetNative()>(); - booleanHelper<Atomic::isFetchAndStoreNative()>(); - booleanHelper<Atomic::isFetchAndAddNative()>(); -#endif } void tst_QAtomicInt::warningFreeHelper() diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp index 9f03c4c2b7..8da52c95fb 100644 --- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp +++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp @@ -196,18 +196,11 @@ void tst_QAtomicIntegerXX::static_checks() (void) QAtomicInteger<T>::isFetchAndAddNative(); (void) QAtomicInteger<T>::isFetchAndAddWaitFree(); -#ifdef Q_COMPILER_CONSTEXPR // this is a compile-time test only booleanHelper<QAtomicInteger<T>::isReferenceCountingWaitFree()>(); booleanHelper<QAtomicInteger<T>::isTestAndSetWaitFree()>(); booleanHelper<QAtomicInteger<T>::isFetchAndStoreWaitFree()>(); booleanHelper<QAtomicInteger<T>::isFetchAndAddWaitFree()>(); -#elif 0 // no longer constexpr - booleanHelper<QAtomicInteger<T>::isReferenceCountingNative()>(); - booleanHelper<QAtomicInteger<T>::isTestAndSetNative()>(); - booleanHelper<QAtomicInteger<T>::isFetchAndStoreNative()>(); - booleanHelper<QAtomicInteger<T>::isFetchAndAddNative()>(); -#endif } void tst_QAtomicIntegerXX::addData() |