diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-24T21·29+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-24T21·29+0100 |
commit | 838f86b0fd880b26539664140f04e5d16669dad8 (patch) | |
tree | c8fee2f0c136fbe5bb0735604e2f04d5b02698ba /third_party/nix/src/libstore/nar-accessor.cc | |
parent | f30b2e610d9e612504a9f6460e0cc83413b80aeb (diff) |
style(3p/nix): Remove 'using std::*' from types.hh r/840
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.
Diffstat (limited to 'third_party/nix/src/libstore/nar-accessor.cc')
-rw-r--r-- | third_party/nix/src/libstore/nar-accessor.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/nix/src/libstore/nar-accessor.cc b/third_party/nix/src/libstore/nar-accessor.cc index 7f6e0377aed4..84bfb531ecd6 100644 --- a/third_party/nix/src/libstore/nar-accessor.cc +++ b/third_party/nix/src/libstore/nar-accessor.cc @@ -74,7 +74,7 @@ struct NarAccessor : public FSAccessor { void isExecutable() override { parents.top()->isExecutable = true; } void preallocateContents(unsigned long long size) override { - currentStart = string(s, pos, 16); + currentStart = std::string(s, pos, 16); assert(size <= std::numeric_limits<size_t>::max()); parents.top()->size = (size_t)size; parents.top()->start = pos; @@ -83,12 +83,12 @@ struct NarAccessor : public FSAccessor { void receiveContents(unsigned char* data, unsigned int len) override { // Sanity check if (!currentStart.empty()) { - assert(len < 16 || currentStart == string((char*)data, 16)); + assert(len < 16 || currentStart == std::string((char*)data, 16)); currentStart.clear(); } } - void createSymlink(const Path& path, const string& target) override { + void createSymlink(const Path& path, const std::string& target) override { createMember(path, NarMember{FSAccessor::Type::tSymlink, false, 0, 0, target}); } |