From eec790c8c699d859617712a77b224750a85a93ad Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Tue, 28 Oct 2014 16:17:23 +0100
Subject: [PATCH] Fix intel cc build
The Intel compiler gets confused by the choice between std::signbit()
and signbit() so we need to remove the using declaration and make
the std namespace explicit to help it a little.
Change-Id: I0242de9497723cbb2f497f683b41b41fabef0b4c
Task-number: QTBUG-42235
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
.../javascriptcore/JavaScriptCore/runtime/MathObject.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp
index 023fe132..93ece10f 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp
@@ -29,8 +29,6 @@
#include <wtf/RandomNumber.h>
#include <wtf/RandomNumberSeed.h>
-using std::signbit;
-
namespace JSC {
ASSERT_CLASS_FITS_IN_CELL(MathObject);
@@ -174,7 +172,7 @@ JSValue JSC_HOST_CALL mathProtoFuncMax(ExecState* exec, JSObject*, JSValue, cons
result = NaN;
break;
}
- if (val > result || (val == 0 && result == 0 && !signbit(val)))
+ if (val > result || (val == 0 && result == 0 && !std::signbit(val)))
result = val;
}
return jsNumber(exec, result);
@@ -190,7 +188,7 @@ JSValue JSC_HOST_CALL mathProtoFuncMin(ExecState* exec, JSObject*, JSValue, cons
result = NaN;
break;
}
- if (val < result || (val == 0 && result == 0 && signbit(val)))
+ if (val < result || (val == 0 && result == 0 && std::signbit(val)))
result = val;
}
return jsNumber(exec, result);
@@ -218,7 +216,7 @@ JSValue JSC_HOST_CALL mathProtoFuncRandom(ExecState* exec, JSObject*, JSValue, c
JSValue JSC_HOST_CALL mathProtoFuncRound(ExecState* exec, JSObject*, JSValue, const ArgList& args)
{
double arg = args.at(0).toNumber(exec);
- if (signbit(arg) && arg >= -0.5)
+ if (std::signbit(arg) && arg >= -0.5)
return jsNumber(exec, -0.0);
double integer = ceil(arg);
return jsNumber(exec, integer - (integer - arg > 0.5));
--
GitLab