From 838f86b0fd880b26539664140f04e5d16669dad8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 24 May 2020 22:29:21 +0100 Subject: style(3p/nix): Remove 'using std::*' from types.hh It is considered bad form to use things from includes in headers, as these directives propagate to everywhere else and can make it confusing. types.hh (which is includes almost literally everywhere) had some of these directives, which this commit removes. --- third_party/nix/src/libstore/binary-cache-store.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'third_party/nix/src/libstore/binary-cache-store.hh') diff --git a/third_party/nix/src/libstore/binary-cache-store.hh b/third_party/nix/src/libstore/binary-cache-store.hh index f5bd66bbd6e1..b8e1ccabf264 100644 --- a/third_party/nix/src/libstore/binary-cache-store.hh +++ b/third_party/nix/src/libstore/binary-cache-store.hh @@ -74,7 +74,7 @@ class BinaryCacheStore : public Store { const Path& path, Callback> callback) noexcept override; - Path queryPathFromHashPart(const string& hashPart) override { + Path queryPathFromHashPart(const std::string& hashPart) override { unsupported("queryPathFromHashPart"); } @@ -84,11 +84,11 @@ class BinaryCacheStore : public Store { RepairFlag repair, CheckSigsFlag checkSigs, std::shared_ptr accessor) override; - Path addToStore(const string& name, const Path& srcPath, bool recursive, + Path addToStore(const std::string& name, const Path& srcPath, bool recursive, HashType hashAlgo, PathFilter& filter, RepairFlag repair) override; - Path addTextToStore(const string& name, const string& s, + Path addTextToStore(const std::string& name, const std::string& s, const PathSet& references, RepairFlag repair) override; void narFromPath(const Path& path, Sink& sink) override; -- cgit 1.4.1