mirror of
https://github.com/NixOS/nix
synced 2025-06-24 22:11:15 +02:00
rename StoreDirConfigItself to StoreDirConfigBase
context: https://github.com/NixOS/nix/pull/13154#discussion_r2081904653
(cherry picked from commit 2dd2142754
)
This commit is contained in:
parent
4dcf21a2f6
commit
7f488dc7d3
2 changed files with 5 additions and 5 deletions
|
@ -104,7 +104,7 @@ struct MixStoreDirMethods
|
|||
* Need to make this a separate class so I can get the right
|
||||
* initialization order in the constructor for `StoreDirConfig`.
|
||||
*/
|
||||
struct StoreDirConfigItself : Config
|
||||
struct StoreDirConfigBase : Config
|
||||
{
|
||||
using Config::Config;
|
||||
|
||||
|
@ -118,12 +118,12 @@ struct StoreDirConfigItself : Config
|
|||
};
|
||||
|
||||
/**
|
||||
* The order of `StoreDirConfigItself` and then `MixStoreDirMethods` is
|
||||
* very important. This ensures that `StoreDirConfigItself::storeDir_`
|
||||
* The order of `StoreDirConfigBase` and then `MixStoreDirMethods` is
|
||||
* very important. This ensures that `StoreDirConfigBase::storeDir_`
|
||||
* is initialized before we have our one chance (because references are
|
||||
* immutable) to initialize `MixStoreDirMethods::storeDir`.
|
||||
*/
|
||||
struct StoreDirConfig : StoreDirConfigItself, MixStoreDirMethods
|
||||
struct StoreDirConfig : StoreDirConfigBase, MixStoreDirMethods
|
||||
{
|
||||
using Params = std::map<std::string, std::string>;
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
namespace nix {
|
||||
|
||||
StoreDirConfig::StoreDirConfig(const Params & params)
|
||||
: StoreDirConfigItself(params)
|
||||
: StoreDirConfigBase(params)
|
||||
, MixStoreDirMethods{storeDir_}
|
||||
{
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue