aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4bytecodegenerator.cpp
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-09-12 13:51:02 +0200
committerErik Verbruggen <erik.verbruggen@qt.io>2017-09-13 12:19:53 +0000
commit2bf1f4af53bd43ff91b33b3b847bf5ea502d4911 (patch)
treec034723070107063d99521a5b121dea728dcf17e /src/qml/compiler/qv4bytecodegenerator.cpp
parent126d9d7cc35d1cca525091a49412ee6683310128 (diff)
Fix building for QNX with buggy GCC
The complaint from GCC was that a static array InstrInfo::argumentCount) cannot be in a union. Change-Id: Ibd8dad478dc95853004fb2a871d5883d4dc73dcc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4bytecodegenerator.cpp')
-rw-r--r--src/qml/compiler/qv4bytecodegenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4bytecodegenerator.cpp b/src/qml/compiler/qv4bytecodegenerator.cpp
index dfdb71b253..78f9639ddd 100644
--- a/src/qml/compiler/qv4bytecodegenerator.cpp
+++ b/src/qml/compiler/qv4bytecodegenerator.cpp
@@ -75,7 +75,7 @@ void BytecodeGenerator::packInstruction(I &i)
if (type >= MOTH_NUM_INSTRUCTIONS())
type -= MOTH_NUM_INSTRUCTIONS();
int instructionsAsInts[sizeof(Instr)/sizeof(int)];
- int nMembers = Moth::Instr::argumentCount[static_cast<int>(i.type)];
+ int nMembers = Moth::InstrInfo::argumentCount[static_cast<int>(i.type)];
memcpy(instructionsAsInts, i.packed + 1, nMembers*sizeof(int));
enum {
Normal,
@@ -182,7 +182,7 @@ void BytecodeGenerator::finalize(Compiler::Context *context)
int BytecodeGenerator::addInstructionHelper(Instr::Type type, const Instr &i, int offsetOfOffset) {
int pos = instructions.size();
- int s = Moth::Instr::argumentCount[static_cast<int>(type)]*sizeof(int);
+ int s = Moth::InstrInfo::argumentCount[static_cast<int>(type)]*sizeof(int);
if (offsetOfOffset != -1)
offsetOfOffset += 1;
I instr{type, static_cast<short>(s + 1), 0, currentLine, offsetOfOffset, -1, "\0\0" };