From e011c3c4b023e5bf206271e642cb55029b614985 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Fri, 24 May 2024 09:43:54 +0200 Subject: [PATCH] Remove CHECK macro from quuid.h file - CHECK name is too common, it turns out webengine uses it widely Amends ef964c254c7a72bc05b1f4f0c6f270f9ad21fecd. Fixes: QTBUG-125627 Change-Id: I53d90621c09c0f50b7bea910875192bc49095987 Reviewed-by: Ivan Solovev --- src/corelib/plugin/quuid.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 504a6971bd..14029f1abc 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -140,12 +140,13 @@ private: { if (lhs.variant() != rhs.variant()) return Qt::compareThreeWay(lhs.variant(), rhs.variant()); + if (lhs.data1 != rhs.data1) + return Qt::compareThreeWay(lhs.data1, rhs.data1); + if (lhs.data2 != rhs.data2) + return Qt::compareThreeWay(lhs.data2, rhs.data2); + if (lhs.data3 != rhs.data3) + return Qt::compareThreeWay(lhs.data3, rhs.data3); -#define CHECK(f1, f2) if ((f1) != (f2)) return Qt::compareThreeWay(f1, f2) - CHECK(lhs.data1, rhs.data1); - CHECK(lhs.data2, rhs.data2); - CHECK(lhs.data3, rhs.data3); -#undef CHECK int c = std::memcmp(lhs.data4, rhs.data4, sizeof(lhs.data4)); return Qt::compareThreeWay(c, 0); }