aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-06-19 00:24:47 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-06-19 00:24:47 +0000
commit3fc58a96387f55226ad78a0d8e765a0f041e8da0 (patch)
tree25c30eb9772a00200cdbc0e858d5b71293e2835b /src/libstore
parent3f8dcfe3fd8372ee8fc1b3233c7e9982d1a6915d (diff)
Remove some `Base::` that crept in
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/content-address.cc2
-rw-r--r--src/libstore/derivations.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/content-address.cc b/src/libstore/content-address.cc
index 5bf51cb97..7de5c0874 100644
--- a/src/libstore/content-address.cc
+++ b/src/libstore/content-address.cc
@@ -31,7 +31,7 @@ template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
std::string renderContentAddress(ContentAddress ca) {
return std::visit(overloaded {
[](TextHash th) {
- return "text:" + th.hash.to_string(Base::Base32, true);
+ return "text:" + th.hash.to_string(Base32, true);
},
[](FileSystemHash fsh) {
return makeFixedOutputCA(fsh.method, fsh.hash);
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 1ba957c4a..6383e31f4 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -267,7 +267,7 @@ string Derivation::unparse(const Store & store, bool maskOutputs,
s += ','; printUnquotedString(s, maskOutputs ? "" : store.printStorePath(i.second.path));
s += ','; printUnquotedString(s, i.second.hash ? i.second.hash->printMethodAlgo() : "");
s += ','; printUnquotedString(s,
- i.second.hash ? i.second.hash->hash.to_string(Base::Base16, false) : "");
+ i.second.hash ? i.second.hash->hash.to_string(Base16, false) : "");
s += ')';
}
@@ -467,7 +467,7 @@ void writeDerivation(Sink & out, const Store & store, const BasicDerivation & dr
out << i.first
<< store.printStorePath(i.second.path)
<< i.second.hash->printMethodAlgo()
- << i.second.hash->hash.to_string(Base::Base16, false);
+ << i.second.hash->hash.to_string(Base16, false);
writeStorePaths(store, out, drv.inputSrcs);
out << drv.platform << drv.builder << drv.args;
out << drv.env.size();