diff options
Diffstat (limited to 'src/nix-store')
-rw-r--r-- | src/nix-store/dotgraph.cc | 2 | ||||
-rw-r--r-- | src/nix-store/dotgraph.hh | 4 | ||||
-rw-r--r-- | src/nix-store/nix-store.cc | 8 | ||||
-rw-r--r-- | src/nix-store/xmlgraph.cc | 2 | ||||
-rw-r--r-- | src/nix-store/xmlgraph.hh | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc index 326c668e06fb..83472b0a3bc3 100644 --- a/src/nix-store/dotgraph.cc +++ b/src/nix-store/dotgraph.cc @@ -94,7 +94,7 @@ void printClosure(const Path & nePath, const StoreExpr & fs) #endif -void printDotGraph(StoreAPI & store, const PathSet & roots) +void printDotGraph(Store & store, const PathSet & roots) { PathSet workList(roots); PathSet doneSet; diff --git a/src/nix-store/dotgraph.hh b/src/nix-store/dotgraph.hh index d3b37642c820..d03c7d5b7a58 100644 --- a/src/nix-store/dotgraph.hh +++ b/src/nix-store/dotgraph.hh @@ -4,8 +4,8 @@ namespace nix { -class StoreAPI; +class Store; -void printDotGraph(StoreAPI & store, const PathSet & roots); +void printDotGraph(Store & store, const PathSet & roots); } diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index d5242492e4fb..b384ad2ab001 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -37,7 +37,7 @@ static Path gcRoot; static int rootNr = 0; static bool indirectRoot = false; static bool noOutput = false; -static std::shared_ptr<StoreAPI> store; +static std::shared_ptr<Store> store; LocalStore & ensureLocalStore() @@ -84,7 +84,7 @@ static PathSet realisePath(Path path, bool build = true) Path rootName = gcRoot; if (rootNr > 1) rootName += "-" + std::to_string(rootNr); if (i->first != "out") rootName += "-" + i->first; - outPath = addPermRoot(ref<StoreAPI>(store), outPath, rootName, indirectRoot); + outPath = addPermRoot(ref<Store>(store), outPath, rootName, indirectRoot); } outputs.insert(outPath); } @@ -100,7 +100,7 @@ static PathSet realisePath(Path path, bool build = true) Path rootName = gcRoot; rootNr++; if (rootNr > 1) rootName += "-" + std::to_string(rootNr); - path = addPermRoot(ref<StoreAPI>(store), path, rootName, indirectRoot); + path = addPermRoot(ref<Store>(store), path, rootName, indirectRoot); } return singleton<PathSet>(path); } @@ -142,7 +142,7 @@ static void opRealise(Strings opFlags, Strings opArgs) } if (settings.get("print-missing", true)) - printMissing(ref<StoreAPI>(store), willBuild, willSubstitute, unknown, downloadSize, narSize); + printMissing(ref<Store>(store), willBuild, willSubstitute, unknown, downloadSize, narSize); if (dryRun) return; diff --git a/src/nix-store/xmlgraph.cc b/src/nix-store/xmlgraph.cc index f88266bbbded..ccb218408a8a 100644 --- a/src/nix-store/xmlgraph.cc +++ b/src/nix-store/xmlgraph.cc @@ -33,7 +33,7 @@ static string makeNode(const string & id) } -void printXmlGraph(StoreAPI & store, const PathSet & roots) +void printXmlGraph(Store & store, const PathSet & roots) { PathSet workList(roots); PathSet doneSet; diff --git a/src/nix-store/xmlgraph.hh b/src/nix-store/xmlgraph.hh index 6d6d12a066d5..6454d3a28d16 100644 --- a/src/nix-store/xmlgraph.hh +++ b/src/nix-store/xmlgraph.hh @@ -4,8 +4,8 @@ namespace nix { -class StoreAPI; +class Store; -void printXmlGraph(StoreAPI & store, const PathSet & roots); +void printXmlGraph(Store & store, const PathSet & roots); } |