From 7ae1dcbb04dd6e742de6331bec1be8ccf2e3bb47 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 26 Oct 2020 10:28:06 +0100 Subject: Remove QT_NO_FLOAT16_OPERATORS macro It's documented to be a workaround for VC++2017 and earlier, which are all not supported in Qt 6 anymore. VC++2019 does not show the problem. Change-Id: Ie66b303a75bb5791675fc9e62bf4a84510068d6d Reviewed-by: Keith Kyzivat Reviewed-by: Thiago Macieira --- src/corelib/global/qfloat16.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/corelib/global/qfloat16.h') diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index 9c6fb29e42..ed20983ac5 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2016 by Southwest Research Institute (R) ** Contact: http://www.qt-project.org/legal ** @@ -112,9 +112,8 @@ private: Q_CORE_EXPORT static const quint32 roundtable[]; friend bool qIsNull(qfloat16 f) noexcept; -#if !defined(QT_NO_FLOAT16_OPERATORS) + friend qfloat16 operator-(qfloat16 a) noexcept; -#endif }; Q_DECLARE_TYPEINFO(qfloat16, Q_PRIMITIVE_TYPE); @@ -215,7 +214,6 @@ inline qfloat16::operator float() const noexcept } #endif -#if !defined(QT_NO_FLOAT16_OPERATORS) inline qfloat16 operator-(qfloat16 a) noexcept { qfloat16 f; @@ -296,7 +294,6 @@ QF16_MAKE_BOOL_OP_INT(!=) #undef QF16_MAKE_BOOL_OP_INT QT_WARNING_POP -#endif // QT_NO_FLOAT16_OPERATORS /*! \internal -- cgit v1.2.3