Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/libstore/include/nix/store/store-dir-config.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion src/libstore/store-dir-config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace nix {

StoreDirConfig::StoreDirConfig(const Params & params)
: StoreDirConfigItself(params)
: StoreDirConfigBase(params)
, MixStoreDirMethods{storeDir_}
{
}
Expand Down
Loading