diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-11 11:35:19 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-06-19 19:38:23 +0200 |
| commit | 3e1d03b1eaf6a5e842bed4ae4f9bb8cca05e5b31 (patch) | |
| tree | 74dd3478dce3bc96121238300fc0bbc6ef97fc3e /tests/auto/corelib/global/qrandomgenerator | |
| parent | 5b686e208ffc68f9f660d36c468280d50a40e3ad (diff) | |
Port Q_STATIC_ASSERT(_X) to static_assert
There is no reason for keep using our macro now that we have C++17.
The macro itself is left in for the moment being, as well as its
detection logic, because it's needed for C code (not everything
supports C11 yet). A few more cleanups will arrive in the next few
patches.
Note that this is a mere search/replace; some places were using
double braces to work around the presence of commas in a macro, no
attempt has been done to fix those.
tst_qglobal had just some minor changes to keep testing the macro.
Change-Id: I1c1c397d9f3e63db3338842bf350c9069ea57639
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/corelib/global/qrandomgenerator')
| -rw-r--r-- | tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp index c3407bcc52..1c6e013adb 100644 --- a/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp +++ b/tests/auto/corelib/global/qrandomgenerator/tst_qrandomgenerator.cpp @@ -182,8 +182,8 @@ void tst_QRandomGenerator::basics() QRandomGenerator64 systemRng64 = *system64; systemRng64 = *system64; - Q_STATIC_ASSERT(std::is_same<decltype(rng64.generate()) COMMA quint64>::value); - Q_STATIC_ASSERT(std::is_same<decltype(system64->generate()) COMMA quint64>::value); + static_assert(std::is_same<decltype(rng64.generate()) COMMA quint64>::value); + static_assert(std::is_same<decltype(system64->generate()) COMMA quint64>::value); } void tst_QRandomGenerator::knownSequence() @@ -390,7 +390,7 @@ void tst_QRandomGenerator::quality() AcceptableThreshold = 4 * PerfectDistribution, FailureThreshold = 16 * PerfectDistribution }; - Q_STATIC_ASSERT(FailureThreshold > AcceptableThreshold); + static_assert(FailureThreshold > AcceptableThreshold); QFETCH(uint, control); if (control & RandomDataMask) @@ -609,7 +609,7 @@ void tst_QRandomGenerator::boundedQuality() AcceptableThreshold = 4 * PerfectDistribution, FailureThreshold = 16 * PerfectDistribution }; - Q_STATIC_ASSERT(FailureThreshold > AcceptableThreshold); + static_assert(FailureThreshold > AcceptableThreshold); QFETCH(uint, control); if (control & RandomDataMask) |