TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix gcc-4.6 weapon build

Browse source 
gcc-4.6 chokes on `static constexpr type value{};`, but accepts
`static constexpr auto value = type{};`

Fixes: 9d213b5282 ("Wrap player_has_weapon return type")
This commit is contained in:
Kp 2015-05-22 03:33:20 +00:00
parent ef1abd87e8
commit 2f00efdcc6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/main/weapon.h
View file

@ -354,9 +354,9 @@ class has_weapon_result
{
uint8_t m_result;
public:
static constexpr tt::integral_constant<uint8_t, 1> has_weapon_flag{};
static constexpr tt::integral_constant<uint8_t, 2> has_energy_flag{};
static constexpr tt::integral_constant<uint8_t, 4> has_ammo_flag{};
static constexpr auto has_weapon_flag = tt::integral_constant<uint8_t, 1>{};
static constexpr auto has_energy_flag = tt::integral_constant<uint8_t, 2>{};
static constexpr auto has_ammo_flag = tt::integral_constant<uint8_t, 4>{};
has_weapon_result() = default;
constexpr has_weapon_result(uint8_t r) : m_result(r)
{