1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qfloat16: further disable the -Wfloat-conversion warning

Browse Source 
It shows up in our headersclean mode.

Fixes: QTBUG-123374
Pick-to: 6.6
Change-Id: I6818d78a57394e37857bfffd17bcf9e350dc493c
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 58796ac177cde3f558aec92c00e7ee8e174ba228)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2024-03-15 08:31:53 -07:00 committed by Qt Cherry-pick Bot
parent 305deaca22
commit fa601afd52
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qfloat16.h
View File

@ -168,6 +168,9 @@ private:
friend size_t qHash(qfloat16 key, size_t seed = 0) noexcept friend size_t qHash(qfloat16 key, size_t seed = 0) noexcept
{ return qHash(float(key), seed); } // 6.4 algorithm, so keep using it; ### Qt 7: fix QTBUG-116077 { return qHash(float(key), seed); } // 6.4 algorithm, so keep using it; ### Qt 7: fix QTBUG-116077
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wfloat-conversion")
#define QF16_MAKE_ARITH_OP_FP(FP, OP) \ #define QF16_MAKE_ARITH_OP_FP(FP, OP) \
friend inline FP operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast<FP>(lhs) OP rhs; } \ friend inline FP operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast<FP>(lhs) OP rhs; } \
friend inline FP operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<FP>(rhs); } friend inline FP operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<FP>(rhs); }
@ -203,7 +206,6 @@ private:
QF16_MAKE_ARITH_OP_INT(/) QF16_MAKE_ARITH_OP_INT(/)
#undef QF16_MAKE_ARITH_OP_INT #undef QF16_MAKE_ARITH_OP_INT
QT_WARNING_PUSH
QT_WARNING_DISABLE_FLOAT_COMPARE QT_WARNING_DISABLE_FLOAT_COMPARE
#if QFLOAT16_IS_NATIVE #if QFLOAT16_IS_NATIVE