aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4instr_moth_p.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-08-29 11:17:02 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-29 09:28:03 +0000
commit99d5cdad6c8580d5ef31c291b721bf6230e2502f (patch)
tree2642382e8bad8556c66eeb4e1ccf7d9711d771f4 /src/qml/compiler/qv4instr_moth_p.h
parentc5398fdb30bf07d06c533b980c7d7a08b3a9740d (diff)
Fix compilation failures on Ubuntu 16.10 (gcc 6.2.0)
Change-Id: Ia70727deb008021cbef6e546816b33ff0ce64afa 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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index b8d62fac08..dc262f5a37 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -496,7 +496,7 @@ struct InstrMeta {
QT_WARNING_PUSH
QT_WARNING_DISABLE_GCC("-Wuninitialized")
#define MOTH_INSTR_META_TEMPLATE(I) \
- template<> struct InstrMeta<(int)Instr::Type::I> { \
+ template<> struct InstrMeta<int(Instr::Type::I)> { \
enum { Size = MOTH_INSTR_SIZE(I) }; \
typedef Instr::instr_##I DataType; \
static const DataType &data(const Instr &instr) { return instr.I; } \
@@ -515,7 +515,7 @@ class InstrData : public InstrMeta<InstrType>::DataType
};
struct Instruction {
-#define MOTH_INSTR_DATA_TYPEDEF(I) typedef InstrData<(int)Instr::Type::I> I;
+#define MOTH_INSTR_DATA_TYPEDEF(I) typedef InstrData<int(Instr::Type::I)> I;
FOR_EACH_MOTH_INSTR(MOTH_INSTR_DATA_TYPEDEF)
#undef MOTH_INSTR_DATA_TYPEDEF
private: