From f5aaa12f1d0f59c9953692a5df1959b82fcbb88a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 24 May 2020 23:06:45 +0100 Subject: style(3p/nix): Remove 'using std::*' from xml-writer.hh See previous commit for more details on why. --- third_party/nix/src/nix-env/nix-env.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/nix/src/nix-env/nix-env.cc') diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index 794250e603b1..e827f31e5df8 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 > Newest; + typedef std::map > 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%’") % -- cgit 1.4.1