diff options
| -rw-r--r-- | third_party/nix/src/libutil/xml-writer.hh | 6 | ||||
| -rw-r--r-- | third_party/nix/src/nix-env/nix-env.cc | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/third_party/nix/src/libutil/xml-writer.hh b/third_party/nix/src/libutil/xml-writer.hh index 76f3c7e3a2..d6f7cddb35 100644 --- a/third_party/nix/src/libutil/xml-writer.hh +++ b/third_party/nix/src/libutil/xml-writer.hh @@ -7,11 +7,7 @@ namespace nix { -using std::list; -using std::map; -using std::string; - -typedef map<std::string, std::string> XMLAttrs; +typedef std::map<std::string, std::string> XMLAttrs; class XMLWriter { private: diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index 794250e603..e827f31e5d 100644 --- a/third_party/nix/src/nix-env/nix-env.cc +++ b/third_party/nix/src/nix-env/nix-env.cc @@ -247,7 +247,7 @@ static DrvInfos filterBySelector(EvalState& state, const DrvInfos& allElems, arbitrarily pick the first one. */ if (newestOnly) { /* Map from package names to derivations. */ - typedef map<std::string, std::pair<DrvInfo, unsigned int> > Newest; + typedef std::map<std::string, std::pair<DrvInfo, unsigned int> > Newest; Newest newest; StringSet multiple; @@ -1367,7 +1367,7 @@ static void opDeleteGenerations(Globals& globals, Strings opFlags, throw Error(format("invalid number of generations ‘%1%’") % opArgs.front()); } - string str_max = std::string(opArgs.front(), 1, opArgs.front().size()); + std::string str_max = std::string(opArgs.front(), 1, opArgs.front().size()); int max; if (!string2Int(str_max, max) || max == 0) { throw Error(format("invalid number of generations to keep ‘%1%’") % |