From 72fb2a7edc169fa480f3a3d8da5a9fd263868491 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 May 2017 16:08:48 +0200 Subject: [PATCH] Fix build on gcc 4.9 http://hydra.nixos.org/build/52408843 --- src/libutil/config.cc | 4 ++-- src/libutil/config.hh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libutil/config.cc b/src/libutil/config.cc index 497afaa1f..f7a46bfee 100644 --- a/src/libutil/config.cc +++ b/src/libutil/config.cc @@ -15,9 +15,9 @@ void Config::set(const std::string & name, const std::string & value) void Config::addSetting(AbstractSetting * setting) { - _settings.emplace(setting->name, Config::SettingData{false, setting}); + _settings.emplace(setting->name, Config::SettingData(false, setting)); for (auto & alias : setting->aliases) - _settings.emplace(alias, Config::SettingData{true, setting}); + _settings.emplace(alias, Config::SettingData(true, setting)); bool set = false; diff --git a/src/libutil/config.hh b/src/libutil/config.hh index 919621091..77620d47d 100644 --- a/src/libutil/config.hh +++ b/src/libutil/config.hh @@ -33,8 +33,11 @@ class Config struct SettingData { - bool isAlias = false; + bool isAlias; AbstractSetting * setting; + SettingData(bool isAlias, AbstractSetting * setting) + : isAlias(isAlias), setting(setting) + { } }; std::map _settings;