diff options
| -rw-r--r-- | src/3rdparty/masm/wtf/StdLibExtras.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4runtime.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/masm/wtf/StdLibExtras.h b/src/3rdparty/masm/wtf/StdLibExtras.h index 605f98ec82..f0d792ed52 100644 --- a/src/3rdparty/masm/wtf/StdLibExtras.h +++ b/src/3rdparty/masm/wtf/StdLibExtras.h @@ -166,7 +166,7 @@ template<typename T> char (&ArrayLengthHelperFunction(T (&)[0]))[0]; // Efficient implementation that takes advantage of powers of two. inline size_t roundUpToMultipleOf(size_t divisor, size_t x) { - ASSERT(divisor && !(divisor & (divisor - 1))); + Q_ASSERT(divisor && !(divisor & (divisor - 1))); size_t remainderMask = divisor - 1; return (x + remainderMask) & ~remainderMask; } diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp index f3d166d695..c95e767bb0 100644 --- a/src/qml/jsruntime/qv4runtime.cpp +++ b/src/qml/jsruntime/qv4runtime.cpp @@ -1716,6 +1716,8 @@ ReturnedValue Runtime::method_ushr(const Value &left, const Value &right) return Encode(res); } +#endif // V4_BOOTSTRAP + ReturnedValue Runtime::method_greaterThan(const Value &left, const Value &right) { TRACE2(left, right); @@ -1824,8 +1826,6 @@ Bool Runtime::method_toBoolean(const Value &value) return value.toBoolean(); } -#endif // V4_BOOTSTRAP - } // namespace QV4 QT_END_NAMESPACE |