diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:47 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-21 16:12:47 +0100 |
| commit | 8d3aa63d533fe5a416554be276e60de48f043516 (patch) | |
| tree | 9077721dd14015f1ac5e081486f0e54d766fe3a7 | |
| parent | d6236863d3c5d6ffe6f8901528e24d64d52ab200 (diff) | |
| parent | eec790c8c699d859617712a77b224750a85a93ad (diff) | |
| download | qtscript-8d3aa63d533fe5a416554be276e60de48f043516.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I7f4b696e66c95eb915fbb8a9ea5f600f731763df
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/MathObject.cpp index 023fe13..93ece10 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)); |