diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-07-03 12:19:08 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-07-07 20:54:12 +0200 |
commit | 1e8d623340bb18c3d39d9bcd165e2250744a445a (patch) | |
tree | cb88c4549ae7adcfcaa2eb72c95edacef875bb76 /tests/auto/corelib | |
parent | 471e4fcb226c4523efe93b1bdaf0db026495da94 (diff) |
QThread::create: remove the pre-C++17 codepaths
As we require C++17 now. The configure-time test checking for
future/async is left in for the moment being.
Change-Id: Ifde39d420673f70a2277f5a645bfaad30935a381
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r-- | tests/auto/corelib/thread/qthread/tst_qthread.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp index f72fec0362..093cd4f031 100644 --- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp +++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp @@ -1449,7 +1449,6 @@ void tst_QThread::create() QCOMPARE(i, 42); } -#if defined(__cpp_init_captures) && __cpp_init_captures >= 201304 { int i = 0; MoveOnlyValue mo(123); @@ -1461,9 +1460,7 @@ void tst_QThread::create() QVERIFY(thread->wait()); QCOMPARE(i, 123); } -#endif // __cpp_init_captures -#ifdef QTHREAD_HAS_VARIADIC_CREATE { int i = 0; const auto &function = [&i](MoveOnlyValue &&mo) { i = mo.v; }; @@ -1486,10 +1483,8 @@ void tst_QThread::create() QVERIFY(thread->wait()); QCOMPARE(i, -1); } -#endif // QTHREAD_HAS_VARIADIC_CREATE } -#ifdef QTHREAD_HAS_VARIADIC_CREATE { // simple parameter passing int i = 0; @@ -1587,7 +1582,6 @@ void tst_QThread::create() QVERIFY(!thread); } #endif // QT_NO_EXCEPTIONS -#endif // QTHREAD_HAS_VARIADIC_CREATE #endif // QT_CONFIG(cxx11_future) } |