diff options
| author | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-08-21 13:23:16 (GMT) |
| commit | d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5 (patch) | |
| tree | 26a2edc99e561721fad57d27f84a2a6c0be73a3c /src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp | |
| parent | 6df41a9378e39f4d46cee1a085463d55fe2af5aa (diff) | |
| parent | ab1df6dea670a60bfef5efd81d6687f9534cfc5d (diff) | |
| download | Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.zip Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.gz Qt-d2cfe342ff109e7135fe2fcb00f60d918a7bfaa5.tar.bz2 | |
Merge commit 'origin/master' into symbolVisibility
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp index 937dc2b..fb9cfe8 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSNotAnObject.cpp @@ -116,7 +116,7 @@ bool JSNotAnObject::deleteProperty(ExecState* exec, unsigned) return false; } -void JSNotAnObject::getPropertyNames(ExecState* exec, PropertyNameArray&) +void JSNotAnObject::getPropertyNames(ExecState* exec, PropertyNameArray&, unsigned) { ASSERT_UNUSED(exec, exec->hadException() && exec->exception() == m_exception); } |