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

Fix gcc-4.9 build of similar/main/wall.cpp

Browse source 
gcc-4.9 shipped without support for std::is_trivially_move_assignable.
This is only needed in a sanity check, so preprocess it out when using a
gcc below gcc-5.

Reported-by: joolswills <https://github.com/dxx-rebirth/dxx-rebirth/issues/411>
Fixes: 57334255ac ("Simplify stuck object cleanup")
This commit is contained in:
Kp 2018-10-20 17:25:59 +00:00
parent 04569ebba5
commit ea5020a773
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
similar/main/wall.cpp
View file

@ -1318,7 +1318,17 @@ void d_level_unique_stuck_object_state::remove_stuck_object(const vcobjidx_t obj
* last object.
*/
auto &last_element = *std::prev(pr.end());
#if defined(__clang__) || __GNUC__ >= 5
/* gcc-4.9.x shipped without support for
* `std::is_trivially_move_assignable`. Since this is just a sanity check
* to warn developers to be careful, restricting it to occur only with
* later compilers is acceptable.
*
* clang claims to be gcc 4.2.1, but does implement
* `std::is_trivially_move_assignable`, so enable it for clang.
*/
static_assert(std::is_trivially_move_assignable<stuckobj>::value, "stuckobj move may require a check to prevent self-move");
#endif
*i = std::move(last_element);
DXX_POISON_VAR(last_element.wallnum, 0xcc);
DXX_POISON_VAR(last_element.objnum, 0xcc);