summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-10-26 07:06:59 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-10-26 07:06:59 (GMT)
commit9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427 (patch)
tree37ae0ceb0eb9d4f74683b02bf3187cfd7f694c6c /src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h
parent2c0921b667ec74df6ad3d749b30bb9b7c5843343 (diff)
parent35c8033ff51ab6d0567e786b790b8cc49852803b (diff)
downloadQt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.zip
Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.gz
Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.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/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) \