From 3e1d03b1eaf6a5e842bed4ae4f9bb8cca05e5b31 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Thu, 11 Jun 2020 11:35:19 +0200 Subject: 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 --- tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp') diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp index e1b8336955..da52e6e026 100644 --- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp @@ -228,7 +228,7 @@ void tst_QNumeric::distinctNaNF() { template void tst_QNumeric::generalNaN_data() { - Q_STATIC_ASSERT(sizeof(F) == sizeof(Whole)); + static_assert(sizeof(F) == sizeof(Whole)); QTest::addColumn("whole"); // Every value with every bit of the exponent set is a NaN. // Sign and mantissa can be anything without interfering with that. @@ -251,7 +251,7 @@ void tst_QNumeric::generalNaN_data() template void tst_QNumeric::generalNaN() { - Q_STATIC_ASSERT(sizeof(F) == sizeof(Whole)); + static_assert(sizeof(F) == sizeof(Whole)); QFETCH(const Whole, whole); F nan; memcpy(&nan, &whole, sizeof(F)); -- cgit v1.2.3