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/thread/qmutex/tst_qmutex.cpp | |
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/thread/qmutex/tst_qmutex.cpp')
-rw-r--r-- | tests/auto/corelib/thread/qmutex/tst_qmutex.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp index 6603e5d7ce..b07f8196c5 100644 --- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp +++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp @@ -90,7 +90,7 @@ enum { }; #if __has_include(<chrono>) -static Q_CONSTEXPR std::chrono::milliseconds waitTimeAsDuration(waitTime); +static constexpr std::chrono::milliseconds waitTimeAsDuration(waitTime); #endif void tst_QMutex::convertToMilliseconds_data() @@ -164,9 +164,9 @@ void tst_QMutex::convertToMilliseconds() QFETCH(qint64, intValue); QFETCH(qint64, expected); - Q_CONSTEXPR qint64 maxShort = std::numeric_limits<short>::max(); - Q_CONSTEXPR qint64 maxInt = std::numeric_limits<int>::max(); - Q_CONSTEXPR qint64 maxUInt = std::numeric_limits<uint>::max(); + constexpr qint64 maxShort = std::numeric_limits<short>::max(); + constexpr qint64 maxInt = std::numeric_limits<int>::max(); + constexpr qint64 maxUInt = std::numeric_limits<uint>::max(); switch (unit) { #define CASE(Unit, Period) \ |