nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 21:16:02 +01:00
Code Activity

Remove std::set alias

Browse source
This commit is contained in:
Eelco Dolstra 2022-02-21 16:28:23 +01:00
parent afcdc7606c
commit fe9afb65bb
11 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libutil/types.hh
View file

@ -11,12 +11,11 @@
namespace nix {
using std::set;
using std::vector;
using std::string;
typedef std::list<string> Strings;
typedef set<string> StringSet;
typedef std::set<string> StringSet;
typedef std::map<string, string> StringMap;
/* Paths are just strings. */
@ -24,7 +23,7 @@ typedef std::map<string, string> StringMap;
typedef string Path;
typedef std::string_view PathView;
typedef std::list<Path> Paths;
typedef set<Path> PathSet;
typedef std::set<Path> PathSet;
typedef vector<std::pair<string, string>> Headers;

2
src/libutil/util.cc
View file

@ -1174,7 +1174,7 @@ void runProgram2(const RunOptions & options)
}
void closeMostFDs(const set<int> & exceptions)
void closeMostFDs(const std::set<int> & exceptions)
{
#if __linux__
try {

2
src/libutil/util.hh
View file

@ -343,7 +343,7 @@ std::vector<char *> stringsToCharPtrs(const Strings & ss);
/* Close all file descriptors except those listed in the given set.
Good practice in child processes. */
void closeMostFDs(const set<int> & exceptions);
void closeMostFDs(const std::set<int> & exceptions);
/* Set the close-on-exec flag for the given file descriptor. */
void closeOnExec(int fd);