lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Move Store::Params typedef to StoreConfig::Params

Browse source 
This is because `StoreConfig` also uses it.
This commit is contained in:
John Ericson 2023-04-17 12:17:35 -04:00
parent 4685c9b55f
commit 0a30b07277
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/store-api.hh
View file

@ -99,6 +99,8 @@ typedef std::map<StorePath, std::optional<ContentAddress>> StorePathCAMap;
struct StoreConfig : public Config struct StoreConfig : public Config
{ {
typedef std::map<std::string, std::string> Params;
using Config::Config; using Config::Config;
StoreConfig() = delete; StoreConfig() = delete;
@ -153,10 +155,6 @@ struct StoreConfig : public Config
class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig
{ {
public:
typedef std::map<std::string, std::string> Params;
protected: protected:
struct PathInfoCacheValue { struct PathInfoCacheValue {

2
src/libstore/uds-remote-store.hh
View file

@ -9,7 +9,7 @@ namespace nix {
struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreConfig struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreConfig
{ {
UDSRemoteStoreConfig(const Store::Params & params) UDSRemoteStoreConfig(const Params & params)
: StoreConfig(params) : StoreConfig(params)
, LocalFSStoreConfig(params) , LocalFSStoreConfig(params)
, RemoteStoreConfig(params) , RemoteStoreConfig(params)