From 07020f1cffbd1effa800a599f6c389e8f60c9e8d Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Wed, 28 Sep 2011 15:27:48 +0200 Subject: [PATCH] Fix compile of the non-threaded V4 interpreter. Change-Id: I263e9826c513f8edaaf510ff1206b588dfe92f7b Reviewed-on: http://codereview.qt-project.org/5725 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint Reviewed-by: Kent Hansen --- src/declarative/qml/v4/qdeclarativev4instruction.cpp | 2 +- src/declarative/qml/v4/qdeclarativev4instruction_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/declarative/qml/v4/qdeclarativev4instruction.cpp b/src/declarative/qml/v4/qdeclarativev4instruction.cpp index 6ae28f9..e9556d6 100644 --- a/src/declarative/qml/v4/qdeclarativev4instruction.cpp +++ b/src/declarative/qml/v4/qdeclarativev4instruction.cpp @@ -362,7 +362,7 @@ V4Instr::Type Bytecode::instructionType(const V4Instr *instr) const return static_cast(0); # undef CHECK_V4_INSTR_CODE #else - return static_cast(instr.common.type); + return static_cast(instr->common.type); #endif } diff --git a/src/declarative/qml/v4/qdeclarativev4instruction_p.h b/src/declarative/qml/v4/qdeclarativev4instruction_p.h index 46336b4..3a125f7 100644 --- a/src/declarative/qml/v4/qdeclarativev4instruction_p.h +++ b/src/declarative/qml/v4/qdeclarativev4instruction_p.h @@ -161,7 +161,7 @@ QT_BEGIN_NAMESPACE # define QML_V4_END_INSTR(I,FMT) code += QML_V4_INSTR_SIZE(I, FMT); instr = (const V4Instr *) code; goto *instr->common.code; # define QML_V4_INSTR_HEADER void *code; #else -# define QML_V4_BEGIN_INSTR(I,FMT) case Instr::I: +# define QML_V4_BEGIN_INSTR(I,FMT) case V4Instr::I: # define QML_V4_END_INSTR(I,FMT) code += QML_V4_INSTR_SIZE(I, FMT); instr = (const V4Instr *) code; break; # define QML_V4_INSTR_HEADER quint8 type; #endif -- 2.7.4