summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-10-28 08:45:04 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-10-28 08:45:04 (GMT)
commit1ec19ed5a69b8b0e11c81037c270072736f48e40 (patch)
tree869800a523b46e527d04c9973f36e294dd101978 /src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
parent0444453661df0f56fd034778028c7abdc0b621cc (diff)
parent1583d643285641bf71e6a107331d788acca9850c (diff)
downloadQt-1ec19ed5a69b8b0e11c81037c270072736f48e40.zip
Qt-1ec19ed5a69b8b0e11c81037c270072736f48e40.tar.gz
Qt-1ec19ed5a69b8b0e11c81037c270072736f48e40.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-driven
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h b/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
index c9196ce..8968252 100644
--- a/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
+++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
@@ -152,8 +152,8 @@ namespace JSC {
macro(op_strcat, 4) \
macro(op_to_primitive, 3) \
\
- macro(op_get_pnames, 3) \
- macro(op_next_pname, 4) \
+ macro(op_get_pnames, 6) \
+ macro(op_next_pname, 7) \
\
macro(op_push_scope, 2) \
macro(op_pop_scope, 1) \