From 2dd214275459b52994941867df185d425ec6a4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 15 May 2025 11:22:37 +0200
Subject: [PATCH] rename StoreDirConfigItself to StoreDirConfigBase

context: https://github.com/NixOS/nix/pull/13154#discussion_r2081904653
---
 src/libstore/include/nix/store/store-dir-config.hh | 8 ++++----
 src/libstore/store-dir-config.cc                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libstore/include/nix/store/store-dir-config.hh b/src/libstore/include/nix/store/store-dir-config.hh
index 40a71e446..6bf9ebf14 100644
--- a/src/libstore/include/nix/store/store-dir-config.hh
+++ b/src/libstore/include/nix/store/store-dir-config.hh
@@ -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>;
 
diff --git a/src/libstore/store-dir-config.cc b/src/libstore/store-dir-config.cc
index 191926be6..ec65013ef 100644
--- a/src/libstore/store-dir-config.cc
+++ b/src/libstore/store-dir-config.cc
@@ -5,7 +5,7 @@
 namespace nix {
 
 StoreDirConfig::StoreDirConfig(const Params & params)
-    : StoreDirConfigItself(params)
+    : StoreDirConfigBase(params)
     , MixStoreDirMethods{storeDir_}
 {
 }