From 56c40449ae989a55f4e680ef4871c611c10d25c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 11 Jul 2023 17:09:39 +0200 Subject: [PATCH] Testlib: Make QTEST_ASSERT usable in constexpr functions Commit 8ea27bb1c669e21100a6a042b0378b3346bdf671 adapted the definition of Q_ASSERT already. Adopt the same logic for QTEST_ASSERT. Change-Id: I5a5d0f62df79b18635d3b426a439c35b25d739c2 Reviewed-by: Marc Mutz (cherry picked from commit d4d600d411333bdfbcd116993ce30abd97b2a9aa) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qtestassert.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h index f112d847ae1..63ebbed71c8 100644 --- a/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h @@ -8,10 +8,9 @@ QT_BEGIN_NAMESPACE +#define QTEST_ASSERT(cond) ((cond) ? static_cast(0) : qt_assert(#cond, __FILE__, __LINE__)) -#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) - -#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) +#define QTEST_ASSERT_X(cond, where, what) ((cond) ? static_cast(0) : qt_assert_x(where, what, __FILE__, __LINE__)) QT_END_NAMESPACE