whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove CHECK macro from quuid.h file 

- CHECK name is too common, it turns out webengine uses it
widely

Amends ef964c254c.

Fixes: QTBUG-125627
Change-Id: I53d90621c09c0f50b7bea910875192bc49095987
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
bb10
Tatiana Borisova 2024-05-24 09:43:54 +02:00 committed by Ivan Solovev
parent 480940f0aa
commit e011c3c4b0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/plugin/quuid.h
View File

@ -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);
}