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/libutil/serialise.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/libutil/serialise.cc')
-rw-r--r-- | third_party/nix/src/libutil/serialise.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/nix/src/libutil/serialise.cc b/third_party/nix/src/libutil/serialise.cc index 34af4e840ab6..52f0b5542601 100644 --- a/third_party/nix/src/libutil/serialise.cc +++ b/third_party/nix/src/libutil/serialise.cc @@ -223,7 +223,7 @@ void writeString(const unsigned char* buf, size_t len, Sink& sink) { writePadding(len, sink); } -Sink& operator<<(Sink& sink, const string& s) { +Sink& operator<<(Sink& sink, const std::string& s) { writeString((const unsigned char*)s.data(), s.size(), sink); return sink; } @@ -269,7 +269,7 @@ size_t readString(unsigned char* buf, size_t max, Source& source) { return len; } -string readString(Source& source, size_t max) { +std::string readString(Source& source, size_t max) { auto len = readNum<size_t>(source); if (len > max) { throw SerialisationError("string is too long"); @@ -280,7 +280,7 @@ string readString(Source& source, size_t max) { return res; } -Source& operator>>(Source& in, string& s) { +Source& operator>>(Source& in, std::string& s) { s = readString(in); return in; } |