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/tools/qpair/tst_qpair.cpp | |
| 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/tools/qpair/tst_qpair.cpp')
| -rw-r--r-- | tests/auto/corelib/tools/qpair/tst_qpair.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/corelib/tools/qpair/tst_qpair.cpp b/tests/auto/corelib/tools/qpair/tst_qpair.cpp index 6ea1b18df2..8eeddf5320 100644 --- a/tests/auto/corelib/tools/qpair/tst_qpair.cpp +++ b/tests/auto/corelib/tools/qpair/tst_qpair.cpp @@ -62,34 +62,34 @@ typedef QPair<P,C> QPairPC; typedef QPair<P,M> QPairPM; typedef QPair<P,P> QPairPP; -Q_STATIC_ASSERT( QTypeInfo<QPairCC>::isComplex); -Q_STATIC_ASSERT( QTypeInfo<QPairCC>::isStatic ); +static_assert( QTypeInfo<QPairCC>::isComplex); +static_assert( QTypeInfo<QPairCC>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairCM>::isComplex); -Q_STATIC_ASSERT( QTypeInfo<QPairCM>::isStatic ); +static_assert( QTypeInfo<QPairCM>::isComplex); +static_assert( QTypeInfo<QPairCM>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairCP>::isComplex); -Q_STATIC_ASSERT( QTypeInfo<QPairCP>::isStatic ); +static_assert( QTypeInfo<QPairCP>::isComplex); +static_assert( QTypeInfo<QPairCP>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairMC>::isComplex); -Q_STATIC_ASSERT( QTypeInfo<QPairMC>::isStatic ); +static_assert( QTypeInfo<QPairMC>::isComplex); +static_assert( QTypeInfo<QPairMC>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairMM>::isComplex); -Q_STATIC_ASSERT(!QTypeInfo<QPairMM>::isStatic ); +static_assert( QTypeInfo<QPairMM>::isComplex); +static_assert(!QTypeInfo<QPairMM>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairMP>::isComplex); -Q_STATIC_ASSERT(!QTypeInfo<QPairMP>::isStatic ); +static_assert( QTypeInfo<QPairMP>::isComplex); +static_assert(!QTypeInfo<QPairMP>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairPC>::isComplex); -Q_STATIC_ASSERT( QTypeInfo<QPairPC>::isStatic ); +static_assert( QTypeInfo<QPairPC>::isComplex); +static_assert( QTypeInfo<QPairPC>::isStatic ); -Q_STATIC_ASSERT( QTypeInfo<QPairPM>::isComplex); -Q_STATIC_ASSERT(!QTypeInfo<QPairPM>::isStatic ); +static_assert( QTypeInfo<QPairPM>::isComplex); +static_assert(!QTypeInfo<QPairPM>::isStatic ); -Q_STATIC_ASSERT(!QTypeInfo<QPairPP>::isComplex); -Q_STATIC_ASSERT(!QTypeInfo<QPairPP>::isStatic ); +static_assert(!QTypeInfo<QPairPP>::isComplex); +static_assert(!QTypeInfo<QPairPP>::isStatic ); -Q_STATIC_ASSERT(!QTypeInfo<QPairPP>::isPointer); +static_assert(!QTypeInfo<QPairPP>::isPointer); void tst_QPair::pairOfReferences() |