diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-04-17 12:17:35 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-07-24 09:03:44 -0400 |
| commit | 0a30b072779aa605b92f1961fe94218ccd183669 (patch) | |
| tree | d8b2613780616d9464e211f189c40f012aca0e91 | |
| parent | 4685c9b55f51f0bd0a55883753d19ec2c213ca7f (diff) | |
Move `Store::Params` typedef to `StoreConfig::Params`
This is because `StoreConfig` also uses it.
| -rw-r--r-- | src/libstore/store-api.hh | 6 | ||||
| -rw-r--r-- | src/libstore/uds-remote-store.hh | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 7b412d2dd..3758c730f 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -99,6 +99,8 @@ typedef std::map<StorePath, std::optional<ContentAddress>> StorePathCAMap; struct StoreConfig : public Config { + typedef std::map<std::string, std::string> Params; + using Config::Config; StoreConfig() = delete; @@ -153,10 +155,6 @@ struct StoreConfig : public Config class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig { -public: - - typedef std::map<std::string, std::string> Params; - protected: struct PathInfoCacheValue { diff --git a/src/libstore/uds-remote-store.hh b/src/libstore/uds-remote-store.hh index 2bd6517fa..b9d9a39b5 100644 --- a/src/libstore/uds-remote-store.hh +++ b/src/libstore/uds-remote-store.hh @@ -9,7 +9,7 @@ namespace nix { struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreConfig { - UDSRemoteStoreConfig(const Store::Params & params) + UDSRemoteStoreConfig(const Params & params) : StoreConfig(params) , LocalFSStoreConfig(params) , RemoteStoreConfig(params) |