From fa601afd5210106aa17f27ab29359f6a10610ba1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 15 Mar 2024 08:31:53 -0700 Subject: [PATCH] qfloat16: further disable the -Wfloat-conversion warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It shows up in our headersclean mode. Fixes: QTBUG-123374 Pick-to: 6.6 Change-Id: I6818d78a57394e37857bfffd17bcf9e350dc493c Reviewed-by: Simo Fält Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 58796ac177cde3f558aec92c00e7ee8e174ba228) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qfloat16.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index d575979cd81..30dd9a60afc 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -168,6 +168,9 @@ private: 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 +QT_WARNING_PUSH +QT_WARNING_DISABLE_GCC("-Wfloat-conversion") + #define QF16_MAKE_ARITH_OP_FP(FP, OP) \ friend inline FP operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast(lhs) OP rhs; } \ friend inline FP operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast(rhs); } @@ -203,7 +206,6 @@ private: QF16_MAKE_ARITH_OP_INT(/) #undef QF16_MAKE_ARITH_OP_INT -QT_WARNING_PUSH QT_WARNING_DISABLE_FLOAT_COMPARE #if QFLOAT16_IS_NATIVE