Move Store::Params
typedef to StoreConfig::Params
This is because `StoreConfig` also uses it.
This commit is contained in:
parent
4685c9b55f
commit
0a30b07277
2 changed files with 3 additions and 5 deletions
|
@ -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 {
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue