From 24d678ce9c3996f46d1069c2b1193e7ec1083fc8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 24 Oct 2013 13:54:20 +0300 Subject: Fix compilation of Qt Script with MSVC 2013. Starting with MSVC 2013, more functions are provided. Change-Id: Iabbc9a94e7ed01584baaa1bb17c06e41ac70830f Reviewed-by: Simon Hausmann Reviewed-by: Friedemann Kleint --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h') 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); } -- cgit v1.2.1