dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #9386: compilers failing to compile with LTO by using variants instead of new + unique_ptr

Browse Source 
With std::variant all memory can be figured out at compile time, so the compiler needs to keep track of fewer elements. It also saves out a unique_ptr and its memory management, over a slight impact for resolving a setting.
This commit is contained in:
rubidium42
2021-06-21 18:46:27 +02:00
committed by Patric Stout
parent f35e6c1c7f
commit 98e653dacc
13 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/settings.cpp
View File

@@ -87,6 +87,7 @@ std::string _config_file; ///< Configuration file of OpenTTD
typedef std::list<ErrorMessageData> ErrorList;
static ErrorList _settings_error_list; ///< Errors while loading minimal settings.
typedef span<const SettingVariant> SettingTable;
typedef void SettingDescProc(IniFile *ini, const SettingTable &desc, const char *grpname, void *object, bool only_startup);
typedef void SettingDescProcList(IniFile *ini, const char *grpname, StringList &list);
@@ -98,9 +99,9 @@ static bool IsSignedVarMemType(VarType vt);
* @param desc The type of the iterator of the value in SettingTable.
* @return The actual pointer to SettingDesc.
*/
static const SettingDesc *GetSettingDesc(const std::unique_ptr<const SettingDesc> &desc)
static constexpr const SettingDesc *GetSettingDesc(const SettingVariant &desc)
{
return desc.get();
return std::visit([](auto&& arg) -> const SettingDesc * { return &arg; }, desc);
}
/**