diff options
Diffstat (limited to 'third_party/nix/src/libstore/store-api.cc')
| -rw-r--r-- | third_party/nix/src/libstore/store-api.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/third_party/nix/src/libstore/store-api.cc b/third_party/nix/src/libstore/store-api.cc index a68e6e8fc8..96c6f93410 100644 --- a/third_party/nix/src/libstore/store-api.cc +++ b/third_party/nix/src/libstore/store-api.cc @@ -262,7 +262,7 @@ Path Store::makeFixedOutputPath(bool recursive, const Hash& hash, "output:out", hashString( htSHA256, - "fixed:out:" + (recursive ? std::string("r:") : "") + + "fixed:out:" + (recursive ? (std::string) "r:" : "") + hash.to_string(Base16) + ":"), name); } @@ -783,7 +783,7 @@ ValidPathInfo decodeValidPathInfo(std::istream& str, bool hashGiven) { } getline(str, info.deriver); std::string s; - int n = 0; + int n; getline(str, s); if (!absl::SimpleAtoi(s, &n)) { throw Error("number expected"); @@ -884,7 +884,7 @@ Strings ValidPathInfo::shortRefs() const { } std::string makeFixedOutputCA(bool recursive, const Hash& hash) { - return "fixed:" + (recursive ? std::string("r:") : "") + hash.to_string(); + return "fixed:" + (recursive ? (std::string) "r:" : "") + hash.to_string(); } void Store::addToStore(const ValidPathInfo& info, Source& narSource, @@ -930,8 +930,7 @@ std::pair<std::string, Store::Params> splitUriAndParams( throw Error("invalid URI parameter '%s'", value); } try { - decoded += std::to_string( - std::stoul(std::string(value, i + 1, 2), nullptr, 16)); + decoded += std::stoul(std::string(value, i + 1, 2), nullptr, 16); i += 3; } catch (...) { throw Error("invalid URI parameter '%s'", value); |