diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-06 09:46:51 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-06 14:25:20 +0000 |
commit | 8e860f836bce8fd70a90798f8817a1410d8d8414 (patch) | |
tree | 9cd4ddc95f3f1e46fd66ee2ddef2d264cac019e1 /tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp | |
parent | 1a0b4b9f26e16532cc3d5532e25d886426ce994e (diff) | |
parent | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (diff) |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp')
-rw-r--r-- | tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp index e482b409a5..61d1f86f00 100644 --- a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp +++ b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp @@ -483,32 +483,6 @@ struct has_qCompareStrings { }; template <typename LHS, typename RHS> -using if_has_qCompareStrings = typename std::enable_if<has_qCompareStrings<LHS, RHS>::value, bool>::type; - -template <typename LHS, typename RHS> -using if_lacks_qCompareStrings = typename std::enable_if<!has_qCompareStrings<LHS, RHS>::value, bool>::type; - -static inline Q_DECL_CONSTEXPR int sign(int x) Q_DECL_NOTHROW -{ - return x < 0 ? -1 : - x > 0 ? +1 : - /*else*/ 0 ; -} - -template <typename LHS, typename RHS, if_has_qCompareStrings<LHS, RHS> = true> -int qCompareStringsWrapper(const LHS &lhs, const RHS &rhs, Qt::CaseSensitivity cs, int) - Q_DECL_NOEXCEPT_EXPR(noexcept(qCompareStrings(lhs, rhs, cs))) -{ - return qCompareStrings(lhs, rhs, cs); -} - -template <typename LHS, typename RHS, if_lacks_qCompareStrings<LHS, RHS> = true> -int qCompareStringsWrapper(const LHS &, const RHS &, Qt::CaseSensitivity, int result) -{ - return result; -} - -template <typename LHS, typename RHS> void tst_QStringApiSymmetry::compare_impl() const { QFETCH(QStringRef, lhsUnicode); @@ -517,6 +491,7 @@ void tst_QStringApiSymmetry::compare_impl() const QFETCH(QLatin1String, rhsLatin1); QFETCH(int, caseSensitiveCompareResult); QFETCH(const int, caseInsensitiveCompareResult); + Q_UNUSED(caseInsensitiveCompareResult); const auto lhsU8 = lhsUnicode.toUtf8(); const auto rhsU8 = rhsUnicode.toUtf8(); @@ -533,10 +508,6 @@ void tst_QStringApiSymmetry::compare_impl() const # define QVERIFY_NOEXCEPT(expr) #endif - QCOMPARE(sign(qCompareStringsWrapper(lhs, rhs, Qt::CaseSensitive, caseSensitiveCompareResult)), - sign(caseSensitiveCompareResult)); - QCOMPARE(sign(qCompareStringsWrapper(lhs, rhs, Qt::CaseInsensitive, caseInsensitiveCompareResult)), - sign(caseInsensitiveCompareResult)); #define CHECK(op) \ QVERIFY_NOEXCEPT(lhs op rhs); \ do { if (caseSensitiveCompareResult op 0) { \ |