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/tools/qlinkedlist/tst_qlinkedlist.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp') diff --git a/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp b/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp index b681676d09..8d4f6ce3fb 100644 --- a/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp +++ b/tests/auto/corelib/tools/qlinkedlist/tst_qlinkedlist.cpp @@ -156,12 +156,12 @@ int Complex::liveCount = 0; Q_DECLARE_METATYPE(Complex); // Tests depend on the fact that: -Q_STATIC_ASSERT(!QTypeInfo::isStatic); -Q_STATIC_ASSERT(!QTypeInfo::isComplex); -Q_STATIC_ASSERT(!QTypeInfo::isStatic); -Q_STATIC_ASSERT(QTypeInfo::isComplex); -Q_STATIC_ASSERT(QTypeInfo::isStatic); -Q_STATIC_ASSERT(QTypeInfo::isComplex); +static_assert(!QTypeInfo::isStatic); +static_assert(!QTypeInfo::isComplex); +static_assert(!QTypeInfo::isStatic); +static_assert(QTypeInfo::isComplex); +static_assert(QTypeInfo::isStatic); +static_assert(QTypeInfo::isComplex); class tst_QLinkedList : public QObject { -- cgit v1.2.3