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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/qml/compiler/qv4instr_moth.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4instr_moth.cpp b/src/qml/compiler/qv4instr_moth.cpp index 20917a5ee3..1cc8abcd24 100644 --- a/src/qml/compiler/qv4instr_moth.cpp +++ b/src/qml/compiler/qv4instr_moth.cpp @@ -43,9 +43,9 @@ using namespace QV4; using namespace QV4::Moth; -int Instr::size(Type type) +int InstrInfo::size(Instr::Type type) { -#define MOTH_RETURN_INSTR_SIZE(I) case Type::I: return InstrMeta<(int)Type::I>::Size; +#define MOTH_RETURN_INSTR_SIZE(I) case Instr::Type::I: return InstrMeta<int(Instr::Type::I)>::Size; switch (type) { FOR_EACH_MOTH_INSTR(MOTH_RETURN_INSTR_SIZE) } @@ -120,7 +120,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { namespace Moth { -const int Instr::argumentCount[] = { +const int InstrInfo::argumentCount[] = { FOR_EACH_MOTH_INSTR(MOTH_COLLECT_NARGS) }; |