mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix e00908f: Visual C++ 2015 compile error 

Microsoft Visual C++ 2015 Update 3 (and possibly other versions) consider a struct member undefined in a
static_assert in the struct body. Moving the static_assert to a member function solves the issue.
pull/6953/head
Niels Martin Hansen 2018-10-27 08:17:40 +02:00
parent 25ab9c1997
commit 50efaa2372
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@ -394,8 +394,6 @@ struct AfterNewGRFScan : NewGRFScanCallback {
bool *save_config_ptr; ///< The pointer to the save config setting.
bool save_config; ///< The save config setting.
assert_compile(sizeof(generation_seed) == sizeof(_settings_game.game_creation.generation_seed));
/**
* Create a new callback.
* @param save_config_ptr Pointer to the save_config local variable which
@ -407,6 +405,9 @@ struct AfterNewGRFScan : NewGRFScanCallback {
join_server_password(NULL), join_company_password(NULL),
save_config_ptr(save_config_ptr), save_config(true)
{
/* Visual C++ 2015 fails compiling this line (AfterNewGRFScan::generation_seed undefined symbol)
* if it's placed outside a member function, directly in the struct body. */
assert_compile(sizeof(generation_seed) == sizeof(_settings_game.game_creation.generation_seed));
}
virtual void OnNewGRFsScanned()