diff options
Diffstat (limited to 'src/qml/jsruntime/qv4math_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4math_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/qml/jsruntime/qv4math_p.h b/src/qml/jsruntime/qv4math_p.h index a3a3715545..9ddb57eaaf 100644 --- a/src/qml/jsruntime/qv4math_p.h +++ b/src/qml/jsruntime/qv4math_p.h @@ -72,8 +72,8 @@ static inline QMLJS_READONLY Value add_int32(int a, int b) : "cc" ); if (!overflow) - return Value::fromInt32(aa); - return Value::fromDouble((double)a + (double)b); + return Primitive::fromInt32(aa); + return Primitive::fromDouble((double)a + (double)b); } static inline QMLJS_READONLY Value sub_int32(int a, int b) @@ -88,8 +88,8 @@ static inline QMLJS_READONLY Value sub_int32(int a, int b) : "cc" ); if (!overflow) - return Value::fromInt32(aa); - return Value::fromDouble((double)a - (double)b); + return Primitive::fromInt32(aa); + return Primitive::fromDouble((double)a - (double)b); } static inline QMLJS_READONLY Value mul_int32(int a, int b) @@ -104,8 +104,8 @@ static inline QMLJS_READONLY Value mul_int32(int a, int b) : "cc" ); if (!overflow) - return Value::fromInt32(aa); - return Value::fromDouble((double)a * (double)b); + return Primitive::fromInt32(aa); + return Primitive::fromDouble((double)a * (double)b); } #else @@ -114,24 +114,24 @@ static inline QMLJS_READONLY Value add_int32(int a, int b) { qint64 result = a + b; if (result > INT_MAX || result < INT_MIN) - return Value::fromDouble(result); - return Value::fromInt32(static_cast<int>(result)); + return Primitive::fromDouble(result); + return Primitive::fromInt32(static_cast<int>(result)); } static inline QMLJS_READONLY Value sub_int32(int a, int b) { qint64 result = a - b; if (result > INT_MAX || result < INT_MIN) - return Value::fromDouble(result); - return Value::fromInt32(static_cast<int>(result)); + return Primitive::fromDouble(result); + return Primitive::fromInt32(static_cast<int>(result)); } static inline QMLJS_READONLY Value mul_int32(int a, int b) { qint64 result = a * b; if (result > INT_MAX || result < INT_MIN) - return Value::fromDouble(result); - return Value::fromInt32(static_cast<int>(result)); + return Primitive::fromDouble(result); + return Primitive::fromInt32(static_cast<int>(result)); } #endif // defined(QMLJS_INLINE_MATH) |