From 106054d3f5e002d46e18a8c01bc660af8959a71c Mon Sep 17 00:00:00 2001 From: Ralf Nolden Date: Fri, 20 May 2016 09:49:32 +0200 Subject: Always use ::copysign instead of std::copysign where available Change to remove the Q_OS_ANDROID define for using ::copysign there instead of std::copysign as other systems are affected as well (FreeBSD 9.3 with gcc 4.8 in particular). The distinction does cause more problems than simply using ::copysign everywhere. Change-Id: I1fe42fdee9c1c1bbb3e5930573ff29c600dfb5e0 Reviewed-by: Erik Verbruggen --- src/qml/jsruntime/qv4mathobject.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/qml/jsruntime/qv4mathobject.cpp') diff --git a/src/qml/jsruntime/qv4mathobject.cpp b/src/qml/jsruntime/qv4mathobject.cpp index 50b81098b2..cb17583b98 100644 --- a/src/qml/jsruntime/qv4mathobject.cpp +++ b/src/qml/jsruntime/qv4mathobject.cpp @@ -85,18 +85,10 @@ Heap::MathObject::MathObject() m->defineDefaultProperty(QStringLiteral("tan"), QV4::MathObject::method_tan, 1); } -#ifdef Q_OS_ANDROID -// C++11's std::copysign is missing in the std namespace, so get it from the root namespace (math.h) static Q_ALWAYS_INLINE double copySign(double x, double y) { return ::copysign(x, y); } -#else // Ok, we have a proper C++11 standard library -static Q_ALWAYS_INLINE double copySign(double x, double y) -{ - return std::copysign(x, y); -} -#endif ReturnedValue MathObject::method_abs(CallContext *context) { -- cgit v1.2.3