From a7fb257ec2b7cb2969b4a97b74aada92c397f3d6 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Mon, 11 Aug 2025 18:40:35 +0300 Subject: [PATCH] libutil: Make AbstractConfig::getSettings const --- src/libutil/config-global.cc | 2 +- src/libutil/configuration.cc | 2 +- src/libutil/include/nix/util/config-global.hh | 2 +- src/libutil/include/nix/util/configuration.hh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libutil/config-global.cc b/src/libutil/config-global.cc index 3b1bc5af9..cd461ea48 100644 --- a/src/libutil/config-global.cc +++ b/src/libutil/config-global.cc @@ -15,7 +15,7 @@ bool GlobalConfig::set(const std::string & name, const std::string & value) return false; } -void GlobalConfig::getSettings(std::map & res, bool overriddenOnly) +void GlobalConfig::getSettings(std::map & res, bool overriddenOnly) const { for (auto & config : configRegistrations()) config->getSettings(res, overriddenOnly); diff --git a/src/libutil/configuration.cc b/src/libutil/configuration.cc index 4db863e1f..dc9d91f63 100644 --- a/src/libutil/configuration.cc +++ b/src/libutil/configuration.cc @@ -85,7 +85,7 @@ void AbstractConfig::reapplyUnknownSettings() set(s.first, s.second); } -void Config::getSettings(std::map & res, bool overriddenOnly) +void Config::getSettings(std::map & res, bool overriddenOnly) const { for (const auto & opt : _settings) if (!opt.second.isAlias && (!overriddenOnly || opt.second.setting->overridden) diff --git a/src/libutil/include/nix/util/config-global.hh b/src/libutil/include/nix/util/config-global.hh index 4a4277c48..0e6f43ec4 100644 --- a/src/libutil/include/nix/util/config-global.hh +++ b/src/libutil/include/nix/util/config-global.hh @@ -17,7 +17,7 @@ struct GlobalConfig : public AbstractConfig bool set(const std::string & name, const std::string & value) override; - void getSettings(std::map & res, bool overriddenOnly = false) override; + void getSettings(std::map & res, bool overriddenOnly = false) const override; void resetOverridden() override; diff --git a/src/libutil/include/nix/util/configuration.hh b/src/libutil/include/nix/util/configuration.hh index cc7e6aff7..65391721c 100644 --- a/src/libutil/include/nix/util/configuration.hh +++ b/src/libutil/include/nix/util/configuration.hh @@ -73,7 +73,7 @@ public: * - res: map to store settings in * - overriddenOnly: when set to true only overridden settings will be added to `res` */ - virtual void getSettings(std::map & res, bool overriddenOnly = false) = 0; + virtual void getSettings(std::map & res, bool overriddenOnly = false) const = 0; /** * Parses the configuration in `contents` and applies it @@ -160,7 +160,7 @@ public: void addSetting(AbstractSetting * setting); - void getSettings(std::map & res, bool overriddenOnly = false) override; + void getSettings(std::map & res, bool overriddenOnly = false) const override; void resetOverridden() override;