diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-07-12 16:14:11 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-07-15 10:45:50 +0000 |
commit | 6845a8f9cadae8c5bcb1bb3e62af720b12437b3d (patch) | |
tree | 4467955b219a1d48dd22ffabdc9ced5df58f4c1c /src | |
parent | 758646871d3e637e8f6875252138f7e7f1387a28 (diff) |
Fix compilation errors with MSVC2015
... this regression was introduced in commit
808d246607b768ea4dc02e3ef0b178e058d6575c
Change-Id: I8b4ea97060d99d4ef39aac8c05bdb438d50d1cc1
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp index b7c919391..a281af6cb 100644 --- a/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp +++ b/src/plugins/generator/iarew/archs/arm/armgeneralsettingsgroup_v8.cpp @@ -91,6 +91,11 @@ struct CpuCoreEntry final CortexM23 = 58, CortexM33 = 59 }; + // Required to compile in MSVC2015. + CpuCoreEntry(CpuCoreCode cc, QByteArray tf) + : coreCode(cc), targetFlag(std::move(tf)) + {} + CpuCoreCode coreCode = Arm7tdmi; QByteArray targetFlag; }; @@ -162,6 +167,13 @@ struct FpuCoreEntry final Vfp5d16 = 7, Vfp9s = 8 }; + + // Required to compile in MSVC2015. + FpuCoreEntry(FpuCoreCode cc, FpuRegistersCount rc, + QByteArray tf) + : coreCode(cc), regsCount(rc), targetFlag(std::move(tf)) + {} + FpuCoreCode coreCode = NoVfp; FpuRegistersCount regsCount = NoFpuRegisters; QByteArray targetFlag; |