diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 14:14:02 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-14 15:52:58 +0200 |
| commit | 6f0df02d002356625f10683ef84da7685d92a2c4 (patch) | |
| tree | 46713209af459ebda534c3404f48c5f5c80ba3f8 /tests/auto/corelib/tools/qpair | |
| parent | 44cce1a2ea9dadd8b2de93f40de34269dda703c0 (diff) | |
Replace Qt CONSTEXPR defines with constexpr
Both normal and relaxed constexpr are required by our new minimum of
C++17.
Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'tests/auto/corelib/tools/qpair')
| -rw-r--r-- | tests/auto/corelib/tools/qpair/tst_qpair.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/corelib/tools/qpair/tst_qpair.cpp b/tests/auto/corelib/tools/qpair/tst_qpair.cpp index 464477d5d1..70caa055b6 100644 --- a/tests/auto/corelib/tools/qpair/tst_qpair.cpp +++ b/tests/auto/corelib/tools/qpair/tst_qpair.cpp @@ -174,15 +174,15 @@ void tst_QPair::structuredBindings() void tst_QPair::testConstexpr() { - Q_CONSTEXPR QPair<int, double> pID = qMakePair(0, 0.0); + constexpr QPair<int, double> pID = qMakePair(0, 0.0); Q_UNUSED(pID); - Q_CONSTEXPR QPair<double, double> pDD = qMakePair(0.0, 0.0); - Q_CONSTEXPR QPair<double, double> pDD2 = qMakePair(0, 0.0); // involes (rvalue) conversion ctor - Q_CONSTEXPR bool equal = pDD2 == pDD; + constexpr QPair<double, double> pDD = qMakePair(0.0, 0.0); + constexpr QPair<double, double> pDD2 = qMakePair(0, 0.0); // involes (rvalue) conversion ctor + constexpr bool equal = pDD2 == pDD; QVERIFY(equal); - Q_CONSTEXPR QPair<QSize, int> pSI = qMakePair(QSize(4, 5), 6); + constexpr QPair<QSize, int> pSI = qMakePair(QSize(4, 5), 6); Q_UNUSED(pSI); } |