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

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>
bb10
Volker Hilsheimer 2020-10-26 10:28:06 +01:00
parent e24be7b6c3
commit 7ae1dcbb04
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/global/qfloat16.cpp
View File

@ -72,19 +72,6 @@ QT_BEGIN_NAMESPACE
\since 5.9
*/
/*!
\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

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

@ -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