diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-10-24 10:54:20 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 06:44:59 (GMT) |
| commit | 158caa355f459480e56dec0dc6aadfd792084a00 (patch) | |
| tree | 1603ff1ed184dd95a71b0c95884ab8beac920db8 | |
| parent | c368cbad3a505d44894ff150dc25c74d0174ca15 (diff) | |
| download | Qt-158caa355f459480e56dec0dc6aadfd792084a00.zip Qt-158caa355f459480e56dec0dc6aadfd792084a00.tar.gz Qt-158caa355f459480e56dec0dc6aadfd792084a00.tar.bz2 | |
Fix compilation of Qt Script with MSVC 2013.
Starting with MSVC 2013, more functions are provided.
Change-Id: Iabbc9a94e7ed01584baaa1bb17c06e41ac70830f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8)
| -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 a18949e..9e2e638 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -96,7 +96,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) @@ -121,7 +121,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); } |