aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-05 14:44:39 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-05 14:44:39 +0000
commite7b0847f2d9674bc18532c86b2daf421347513e4 (patch)
tree5a72231f31e926c8575f4f592f65859cc79f168c /src/libstore/build.cc
parent839f0fe0956cf4434b64e81a0966e780051901ad (diff)
Make names more consistent
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 0176e7f65..6c9f55a53 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) {