diff options
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp index d4310fc..937dc2b 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp @@ -37,13 +37,13 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSNotAnObject); // JSValue methods -JSValuePtr JSNotAnObject::toPrimitive(ExecState* exec, PreferredPrimitiveType) const +JSValue JSNotAnObject::toPrimitive(ExecState* exec, PreferredPrimitiveType) const { ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return m_exception; } -bool JSNotAnObject::getPrimitiveNumber(ExecState* exec, double&, JSValuePtr&) +bool JSNotAnObject::getPrimitiveNumber(ExecState* exec, double&, JSValue&) { ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return false; @@ -69,8 +69,7 @@ UString JSNotAnObject::toString(ExecState* exec) const JSObject* JSNotAnObject::toObject(ExecState* exec) const { - UNUSED_PARAM(exec); - ASSERT(exec->hadException() && exec->exception() == m_exception); + ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); return m_exception; } @@ -95,12 +94,12 @@ bool JSNotAnObject::getOwnPropertySlot(ExecState* exec, unsigned, PropertySlot&) return false; } -void JSNotAnObject::put(ExecState* exec, const Identifier& , JSValuePtr, PutPropertySlot&) +void JSNotAnObject::put(ExecState* exec, const Identifier& , JSValue, PutPropertySlot&) { ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); } -void JSNotAnObject::put(ExecState* exec, unsigned, JSValuePtr) +void JSNotAnObject::put(ExecState* exec, unsigned, JSValue) { ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); } |