diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:18:03 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:18:04 +0100 |
| commit | 9520f82e00f26d7d217f7d2777ba2f3cd958d012 (patch) | |
| tree | f892162ab33e9b1b7ffa9819fbec49af86196802 /src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | |
| parent | 9b5cc9e6082366cbe6e76c29d493448ef496b43e (diff) | |
| parent | 78985c5c2c4ec8c7d06bf0c59c5534f968d62f07 (diff) | |
| download | qtscript-9520f82e00f26d7d217f7d2777ba2f3cd958d012.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1f7bde2c0f17d6cdb2914ef2b3aff271ad584321
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index fc5676a..81a1d8a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -90,7 +90,7 @@ inline bool signbit(double x) { struct ieee_double *p = (struct ieee_double *)&x #endif -#if COMPILER(MSVC) || COMPILER(RVCT) +#if (COMPILER(MSVC) && _MSC_VER < 1800) || COMPILER(RVCT) // We must not do 'num + 0.5' or 'num - 0.5' because they can cause precision loss. static double round(double num) @@ -115,7 +115,7 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); } #endif -#if COMPILER(MSVC) +#if COMPILER(MSVC) && _MSC_VER < 1800 inline bool isinf(double num) { return !_finite(num) && !_isnan(num); } inline bool isnan(double num) { return !!_isnan(num); } |