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/qflags | |
| 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/qflags')
| -rw-r--r-- | tests/auto/corelib/global/qflags/tst_qflags.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index 4df448373d..7060fc8b31 100644 --- a/tests/auto/corelib/global/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp @@ -135,10 +135,10 @@ void tst_QFlags::signedness() // underlying type is implementation-defined, we need to allow for // a different signedness, so we only check that the relative // signedness of the types matches: - Q_STATIC_ASSERT((std::is_unsigned<typename std::underlying_type<Qt::MouseButton>::type>::value == + static_assert((std::is_unsigned<typename std::underlying_type<Qt::MouseButton>::type>::value == std::is_unsigned<Qt::MouseButtons::Int>::value)); - Q_STATIC_ASSERT((std::is_signed<typename std::underlying_type<Qt::AlignmentFlag>::type>::value == + static_assert((std::is_signed<typename std::underlying_type<Qt::AlignmentFlag>::type>::value == std::is_signed<Qt::Alignment::Int>::value)); } @@ -149,9 +149,9 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( MyStrictFlags ) enum class MyStrictNoOpEnum { StrictZero, StrictOne, StrictTwo, StrictFour=4 }; Q_DECLARE_FLAGS( MyStrictNoOpFlags, MyStrictNoOpEnum ) -Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isComplex ); -Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isStatic ); -Q_STATIC_ASSERT( !QTypeInfo<MyStrictFlags>::isPointer ); +static_assert( !QTypeInfo<MyStrictFlags>::isComplex ); +static_assert( !QTypeInfo<MyStrictFlags>::isStatic ); +static_assert( !QTypeInfo<MyStrictFlags>::isPointer ); void tst_QFlags::classEnum() { @@ -319,9 +319,9 @@ enum MyEnum { Zero, One, Two, Four=4 }; Q_DECLARE_FLAGS( MyFlags, MyEnum ) Q_DECLARE_OPERATORS_FOR_FLAGS( MyFlags ) -Q_STATIC_ASSERT( !QTypeInfo<MyFlags>::isComplex ); -Q_STATIC_ASSERT( !QTypeInfo<MyFlags>::isStatic ); -Q_STATIC_ASSERT( !QTypeInfo<MyFlags>::isPointer ); +static_assert( !QTypeInfo<MyFlags>::isComplex ); +static_assert( !QTypeInfo<MyFlags>::isStatic ); +static_assert( !QTypeInfo<MyFlags>::isPointer ); QTEST_MAIN(tst_QFlags) #include "tst_qflags.moc" |