diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-26 10:28:06 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-28 00:25:58 +0100 |
| commit | 7ae1dcbb04dd6e742de6331bec1be8ccf2e3bb47 (patch) | |
| tree | c94dbec099059cc050c09c2f738529459a28c5cb /src | |
| parent | e24be7b6c3a85214b64abeff9aa14e1d1cf4640d (diff) | |
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 <keith.kyzivat@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qfloat16.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/global/qfloat16.h | 7 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp index 05f03d0370..7dd2f7b331 100644 --- a/src/corelib/global/qfloat16.cpp +++ b/src/corelib/global/qfloat16.cpp @@ -73,19 +73,6 @@ QT_BEGIN_NAMESPACE */ /*! - \macro QT_NO_FLOAT16_OPERATORS - \relates qfloat16 - \since 5.12.4 - - Defining this macro disables the arithmetic operators for qfloat16. - - This is only necessary on Visual Studio 2017 (and earlier) when including - \c {<QFloat16>} and \c{<bitset>} in the same translation unit, which would - otherwise cause a compilation error due to a toolchain bug (see - [QTBUG-72073]). -*/ - -/*! \fn bool qIsInf(qfloat16 f) \relates qfloat16 \overload qIsInf(float) 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 |