diff options
| author | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
| commit | 180d9189e8098d98848367f673fff723ddd1d068 (patch) | |
| tree | b052fb1b8361e962884f54aa4d6e6d8dd6f67e73 /src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h | |
| parent | 18acf933474577a4cec31560eeee22de04111e1e (diff) | |
| parent | 0f6909e8e1be93d16798d31f18c4da2b0b5a084c (diff) | |
| download | Qt-180d9189e8098d98848367f673fff723ddd1d068.zip Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.gz Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h index 3046b28..e17b055 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.h @@ -129,7 +129,6 @@ namespace JSC { NEVER_INLINE bool resolveGlobal(CallFrame*, Instruction*, JSValue& exceptionValue); NEVER_INLINE void resolveBase(CallFrame*, Instruction* vPC); NEVER_INLINE bool resolveBaseAndProperty(CallFrame*, Instruction*, JSValue& exceptionValue); - NEVER_INLINE bool resolveBaseAndFunc(CallFrame*, Instruction*, JSValue& exceptionValue); NEVER_INLINE ScopeChainNode* createExceptionScope(CallFrame*, const Instruction* vPC); void tryCacheGetByID(CallFrame*, CodeBlock*, Instruction*, JSValue baseValue, const Identifier& propertyName, const PropertySlot&); |