From 2f00efdcc63eac1811957724cb0b65def3940fa2 Mon Sep 17 00:00:00 2001 From: Kp Date: Fri, 22 May 2015 03:33:20 +0000 Subject: [PATCH] Fix gcc-4.6 weapon build gcc-4.6 chokes on `static constexpr type value{};`, but accepts `static constexpr auto value = type{};` Fixes: 9d213b5282a669acd65b9a11593ec976f5c887b7 ("Wrap player_has_weapon return type") --- common/main/weapon.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/main/weapon.h b/common/main/weapon.h index f0934415e..ed1fc2a55 100644 --- a/common/main/weapon.h +++ b/common/main/weapon.h @@ -354,9 +354,9 @@ class has_weapon_result { uint8_t m_result; public: - static constexpr tt::integral_constant has_weapon_flag{}; - static constexpr tt::integral_constant has_energy_flag{}; - static constexpr tt::integral_constant has_ammo_flag{}; + static constexpr auto has_weapon_flag = tt::integral_constant{}; + static constexpr auto has_energy_flag = tt::integral_constant{}; + static constexpr auto has_ammo_flag = tt::integral_constant{}; has_weapon_result() = default; constexpr has_weapon_result(uint8_t r) : m_result(r) {