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

QVariant: move the NaN comparison into the spaceShip function 

Note: NaN = not Not A Naan

Change-Id: I3d74c753055744deb8acfffd17248a02f7968121
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
bb10
Thiago Macieira 2022-11-04 17:51:23 -07:00
parent a3b4fffc04
commit 8a3a87d13c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qvariant.cpp
View File

@ -2230,6 +2230,10 @@ template <typename Numeric> static QPartialOrdering spaceShip(Numeric lhs, Numer
{
if (lhs == rhs)
return QPartialOrdering::Equivalent;
if constexpr (std::numeric_limits<Numeric>::has_quiet_NaN) {
if (std::isnan(lhs) || std::isnan(rhs))
return QPartialOrdering::Unordered;
}
bool smaller;
if constexpr (std::is_same_v<Numeric, QObject *>)
@ -2270,8 +2274,6 @@ static QPartialOrdering numericCompare(const QVariant::Private *d1, const QVaria
if (*r1 == *r2)
return QPartialOrdering::Equivalent;
if (std::isnan(*r1) || std::isnan(*r2))
return QPartialOrdering::Unordered;
return spaceShip<qreal>(*r1, *r2);
}