diff options
author | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-12-11 11:31:18 +0100 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-12-11 11:17:42 +0000 |
commit | b894dfe311bb90210af102a59b3a09f587bb7442 (patch) | |
tree | af8207e120337adeec72f3ae3b75fee30a5304ed /src/corelib | |
parent | 0ba7df26038e3cea431ee70995332d7e9f027213 (diff) |
Fix compilation of isnan/isinf for MSVC2012.
MSVC doesn't define float versions for _isnan/_isfinite, so the double
versions need to be used. This is already done in the surrounding
functions, but not in these two.
Change-Id: Ic183358dc1790279e18d00a08b7279e76c02af60
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qnumeric_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index a6b01b796f..e1941fcbe0 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -87,8 +87,8 @@ namespace qnumeric_std_wrapper { 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 !!_isnanf(f); } -static inline bool isinf(float f) { return !_finitef(f) && !_isnan(f); } +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(Q_CC_MSVC) && (defined(Q_OS_QNX) || !defined(__cplusplus) || __cplusplus < 201103L) static inline bool isnan(double d) { return math_h_isnan(d); } |