summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-09-24 16:40:35 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2020-10-20 10:49:30 +0200
commit83cae7c9e3c12434046f2124b4d0c345157ffcb2 (patch)
tree516a74250d35ff537f57548ba0d28e6df317918a /tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
parent141fae112abc7c7deb0d839ddf351a34f79c646b (diff)
Drop constexpr from QAtomicTraits::isLockFree()
As requested by a ### Qt 6 comment. This then implied a few other functions weren't constexpr, which broke some tests. Task-number: QTBUG-85700 Change-Id: I6522a9b2d7a74e117442121400a1d7198d323967 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp')
-rw-r--r--tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index 260dbc30e8..db9839d1ed 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -156,14 +156,15 @@ static void constexprFunctionsHelperTemplate()
{
#ifdef Q_COMPILER_CONSTEXPR
// this is a compile-time test only
- booleanHelper<Atomic::isReferenceCountingNative()>();
booleanHelper<Atomic::isReferenceCountingWaitFree()>();
- booleanHelper<Atomic::isTestAndSetNative()>();
booleanHelper<Atomic::isTestAndSetWaitFree()>();
- booleanHelper<Atomic::isFetchAndStoreNative()>();
booleanHelper<Atomic::isFetchAndStoreWaitFree()>();
- booleanHelper<Atomic::isFetchAndAddNative()>();
booleanHelper<Atomic::isFetchAndAddWaitFree()>();
+#elif 0 // No longer constexpr
+ booleanHelper<Atomic::isReferenceCountingNative()>();
+ booleanHelper<Atomic::isTestAndSetNative()>();
+ booleanHelper<Atomic::isFetchAndStoreNative()>();
+ booleanHelper<Atomic::isFetchAndAddNative()>();
#endif
}