summaryrefslogtreecommitdiff
path: root/src/table/settings/settings.ini
diff options
context:
space:
mode:
authorrubidium42 <rubidium@openttd.org>2021-06-21 18:46:27 +0200
committerPatric Stout <github@truebrain.nl>2021-06-26 20:28:34 +0200
commit98e653dacc98d308e440503c9cf9bba01933d1b4 (patch)
treee90907756d28cfc68d9200d094e790984ca0606a /src/table/settings/settings.ini
parentf35e6c1c7fdaefc9153a54c089dbaa6e2549e6b1 (diff)
downloadopenttd-98e653dacc98d308e440503c9cf9bba01933d1b4.tar.xz
Fix #9386: compilers failing to compile with LTO by using variants instead of new + unique_ptr
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.
Diffstat (limited to 'src/table/settings/settings.ini')
-rw-r--r--src/table/settings/settings.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/table/settings/settings.ini b/src/table/settings/settings.ini
index 6fe4d9d51..a0a835364 100644
--- a/src/table/settings/settings.ini
+++ b/src/table/settings/settings.ini
@@ -49,7 +49,7 @@ static void UpdateClientConfigValues();
* assigns its own value. If the setting was company-based, that would mean that
* vehicles could decide on different moments that they are heading back to a
* service depot, causing desyncs on a massive scale. */
-const SettingTable _settings{
+static const SettingVariant _settings[] = {
[post-amble]
};
[templates]