aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-05 14:49:25 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-05 14:49:25 +0000
commitb9ebe373bbab6f19ee650ef9769ad76c32b7244d (patch)
tree95f4f07c382bcb6af93ece988b278d9b64d2d375 /src/libstore/build.cc
parent951415b5685fe52d31770eadabd66d95ea75cfae (diff)
Sed some names to perhaps avoid conflicts
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r--src/libstore/build.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 7c8323c29..38897a9e2 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3722,18 +3722,18 @@ void DerivationGoal::registerOutputs()
std::optional<ContentAddress> ca;
if (! std::holds_alternative<DerivationOutputInputAddressed>(i.second.output)) {
- DerivationOutputFloating outputHash;
+ DerivationOutputCAFloating outputHash;
std::visit(overloaded {
[&](DerivationOutputInputAddressed doi) {
assert(false); // Enclosing `if` handles this case in other branch
},
- [&](DerivationOutputFixed dof) {
- outputHash = DerivationOutputFloating {
+ [&](DerivationOutputCAFixed dof) {
+ outputHash = DerivationOutputCAFloating {
.method = dof.hash.method,
.hashType = dof.hash.hash.type,
};
},
- [&](DerivationOutputFloating dof) {
+ [&](DerivationOutputCAFloating dof) {
outputHash = dof;
},
}, i.second.output);
@@ -3758,7 +3758,7 @@ void DerivationGoal::registerOutputs()
// true if either floating CA, or incorrect fixed hash.
bool needsMove = true;
- if (auto p = std::get_if<DerivationOutputFixed>(& i.second.output)) {
+ if (auto p = std::get_if<DerivationOutputCAFixed>(& i.second.output)) {
Hash & h = p->hash.hash;
if (h != h2) {