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 --- src/gui/util/qgridlayoutengine_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/util/qgridlayoutengine_p.h') diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index 33bd4ad917..19ed07d30d 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -105,8 +105,8 @@ template class QHVContainer { T m_data[2]; - Q_STATIC_ASSERT(Qt::Horizontal == 0x1); - Q_STATIC_ASSERT(Qt::Vertical == 0x2); + static_assert(Qt::Horizontal == 0x1); + static_assert(Qt::Vertical == 0x2); static constexpr int map(Qt::Orientation o) noexcept { return int(o) - 1; -- cgit v1.2.3