Remove checks for features available in C++17

This patch removes most of the checks that are made using C++20
__cpp_* macros for features available in C++17 and earlier.
Library feature check macros (__cpp_lib_*) are unaffected.

Change-Id: I557b2bd0d4ff09b13837555e9880eb28e0355f64
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 0 insertions, 12 deletions

diff --git a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
index a78004f04d..3d95022181 100644
--- a/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
+++ b/tests/auto/corelib/text/qstringview/tst_qstringview.cpp
@@ -552,13 +552,11 @@ void tst_QStringView::tokenize() const
     QFETCH(const QStringList, result);
 
     // lvalue QString
-#ifdef __cpp_deduction_guides
     {
         auto rit = result.cbegin();
         for (auto sv : QStringTokenizer{str, sep})
             QCOMPARE(sv, *rit++);
     }
-#endif
     {
         auto rit = result.cbegin();
         for (auto sv : QStringView{str}.tokenize(sep))
@@ -566,13 +564,11 @@ void tst_QStringView::tokenize() const
     }
 
     // rvalue QString
-#ifdef __cpp_deduction_guides
     {
         auto rit = result.cbegin();
         for (auto sv : QStringTokenizer{str, QString{sep}})
             QCOMPARE(sv, *rit++);
     }
-#endif
     {
         auto rit = result.cbegin();
         for (auto sv : QStringView{str}.tokenize(QString{sep}))
@@ -580,13 +576,11 @@ void tst_QStringView::tokenize() const
     }
 
     // (rvalue) QChar
-#ifdef __cpp_deduction_guides
     if (sep.size() == 1) {
         auto rit = result.cbegin();
         for (auto sv : QStringTokenizer{str, sep.front()})
             QCOMPARE(sv, *rit++);
     }
-#endif
     if (sep.size() == 1) {
         auto rit = result.cbegin();
         for (auto sv : QStringView{str}.tokenize(sep.front()))
@@ -594,13 +588,11 @@ void tst_QStringView::tokenize() const
     }
 
     // (rvalue) char16_t
-#ifdef __cpp_deduction_guides
     if (sep.size() == 1) {
         auto rit = result.cbegin();
         for (auto sv : QStringTokenizer{str, *qToStringViewIgnoringNull(sep).utf16()})
             QCOMPARE(sv, *rit++);
     }
-#endif
     if (sep.size() == 1) {
         auto rit = result.cbegin();
         for (auto sv : QStringView{str}.tokenize(*qToStringViewIgnoringNull(sep).utf16()))
@@ -615,20 +607,17 @@ void tst_QStringView::tokenize() const
         return literal;
     };
     const std::unique_ptr<const char16_t[]> literal = make_literal(sep);
-#ifdef __cpp_deduction_guides
     {
         auto rit = result.cbegin();
         for (auto sv : QStringTokenizer{str, literal.get()})
             QCOMPARE(sv, *rit++);
     }
-#endif
     {
         auto rit = result.cbegin();
         for (auto sv : QStringView{str}.tokenize(literal.get()))
             QCOMPARE(sv, *rit++);
     }
 
-#ifdef __cpp_deduction_guides
 #ifdef __cpp_lib_ranges
     // lvalue QString
     {
@@ -657,7 +646,6 @@ void tst_QStringView::tokenize() const
         QCOMPARE(result, actual);
     }
 #endif // __cpp_lib_ranges
-#endif // __cpp_deduction_guides
 }
 
 template <typename Char>