diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-09-12 13:51:02 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-09-13 12:19:53 +0000 |
| commit | 2bf1f4af53bd43ff91b33b3b847bf5ea502d4911 (patch) | |
| tree | c034723070107063d99521a5b121dea728dcf17e /src/qml/compiler/qv4instr_moth_p.h | |
| parent | 126d9d7cc35d1cca525091a49412ee6683310128 (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/qv4instr_moth_p.h')
| -rw-r--r-- | src/qml/compiler/qv4instr_moth_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h index 8234f1261e..39309aad2b 100644 --- a/src/qml/compiler/qv4instr_moth_p.h +++ b/src/qml/compiler/qv4instr_moth_p.h @@ -475,13 +475,15 @@ union Instr FOR_EACH_MOTH_INSTR(MOTH_INSTR_ENUM) }; - static const int argumentCount[]; - FOR_EACH_MOTH_INSTR(MOTH_EMIT_STRUCTS) FOR_EACH_MOTH_INSTR(MOTH_EMIT_INSTR_MEMBERS) +}; - static int size(Type type); +struct InstrInfo +{ + static const int argumentCount[]; + static int size(Instr::Type type); }; Q_STATIC_ASSERT(MOTH_NUM_INSTRUCTIONS() < 128); |