aleksanaa/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove std::list alias

Browse source
This commit is contained in:
Eelco Dolstra 2022-02-21 16:25:12 +01:00
parent e2422c4582
commit afcdc7606c
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/get-drvs.hh
View file

@ -70,9 +70,9 @@ public:
#if HAVE_BOEHMGC #if HAVE_BOEHMGC
typedef list<DrvInfo, traceable_allocator<DrvInfo> > DrvInfos; typedef std::list<DrvInfo, traceable_allocator<DrvInfo> > DrvInfos;
#else #else
typedef list<DrvInfo> DrvInfos; typedef std::list<DrvInfo> DrvInfos;
#endif #endif

4
src/libexpr/primops.cc
View file

@ -574,9 +574,9 @@ struct CompareValues
#if HAVE_BOEHMGC #if HAVE_BOEHMGC
typedef list<Value *, gc_allocator<Value *> > ValueList; typedef std::list<Value *, gc_allocator<Value *> > ValueList;
#else #else
typedef list<Value *> ValueList; typedef std::list<Value *> ValueList;
#endif #endif

2
src/libstore/names.hh
View file

@ -25,7 +25,7 @@ private:
std::unique_ptr<Regex> regex; std::unique_ptr<Regex> regex;
}; };
typedef list<DrvName> DrvNames; typedef std::list<DrvName> DrvNames;
std::string_view nextComponent(std::string_view::const_iterator & p, std::string_view nextComponent(std::string_view::const_iterator & p,
const std::string_view::const_iterator end); const std::string_view::const_iterator end);

2
src/libstore/pathlocks.hh
View file

@ -20,7 +20,7 @@ class PathLocks
{ {
private: private:
typedef std::pair<int, Path> FDPair; typedef std::pair<int, Path> FDPair;
list<FDPair> fds; std::list<FDPair> fds;
bool deletePaths; bool deletePaths;
public: public:

5
src/libutil/types.hh
View file

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