diff options
author | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:48:29 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-02-08 15:49:18 +0100 |
commit | dd756011da13b95fdb630a1bbb90234f1e60f415 (patch) | |
tree | a6259b1e9b6463108796ce912e3d1752e301505f /src/corelib/global/qnumeric_p.h | |
parent | 0c50edbe84914469973a3b10e0170023ccdd66fe (diff) | |
parent | b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
configure.json
mkspecs/win32-icc/qmake.conf
Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
Diffstat (limited to 'src/corelib/global/qnumeric_p.h')
-rw-r--r-- | src/corelib/global/qnumeric_p.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index 62add95533..2291675501 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -66,7 +66,7 @@ #include <float.h> #endif -#if !defined(Q_CC_MSVC) && (defined(Q_OS_QNX) || defined(Q_CC_INTEL) || !defined(__cplusplus)) +#if !defined(Q_CC_MSVC) && (defined(Q_OS_QNX) || defined(Q_CC_INTEL)) # include <math.h> # ifdef isnan # define QT_MATH_H_DEFINES_MACROS @@ -92,14 +92,7 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE namespace qnumeric_std_wrapper { -#if defined(Q_CC_MSVC) && _MSC_VER < 1800 -static inline bool isnan(double d) { return !!_isnan(d); } -static inline bool isinf(double d) { return !_finite(d) && !_isnan(d); } -static inline bool isfinite(double d) { return !!_finite(d); } -static inline bool isnan(float f) { return !!_isnan(f); } -static inline bool isinf(float f) { return !_finite(f) && !_isnan(f); } -static inline bool isfinite(float f) { return !!_finite(f); } -#elif defined(QT_MATH_H_DEFINES_MACROS) +#if defined(QT_MATH_H_DEFINES_MACROS) # undef QT_MATH_H_DEFINES_MACROS static inline bool isnan(double d) { return math_h_isnan(d); } static inline bool isinf(double d) { return math_h_isinf(d); } |