From afcdc7606cb9c1a1603a3a51b08ac411f82795db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Feb 2022 16:25:12 +0100 Subject: [PATCH] Remove std::list alias --- src/libexpr/get-drvs.hh | 4 ++-- src/libexpr/primops.cc | 4 ++-- src/libstore/names.hh | 2 +- src/libstore/pathlocks.hh | 2 +- src/libutil/types.hh | 5 ++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/get-drvs.hh index 29bb6a660..128354682 100644 --- a/src/libexpr/get-drvs.hh +++ b/src/libexpr/get-drvs.hh @@ -70,9 +70,9 @@ public: #if HAVE_BOEHMGC -typedef list > DrvInfos; +typedef std::list > DrvInfos; #else -typedef list DrvInfos; +typedef std::list DrvInfos; #endif diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index defb861e6..6f79fc49d 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -574,9 +574,9 @@ struct CompareValues #if HAVE_BOEHMGC -typedef list > ValueList; +typedef std::list > ValueList; #else -typedef list ValueList; +typedef std::list ValueList; #endif diff --git a/src/libstore/names.hh b/src/libstore/names.hh index 6f01fe2a1..ecbad10b3 100644 --- a/src/libstore/names.hh +++ b/src/libstore/names.hh @@ -25,7 +25,7 @@ private: std::unique_ptr regex; }; -typedef list DrvNames; +typedef std::list DrvNames; std::string_view nextComponent(std::string_view::const_iterator & p, const std::string_view::const_iterator end); diff --git a/src/libstore/pathlocks.hh b/src/libstore/pathlocks.hh index 919c8904c..759b9a584 100644 --- a/src/libstore/pathlocks.hh +++ b/src/libstore/pathlocks.hh @@ -20,7 +20,7 @@ class PathLocks { private: typedef std::pair FDPair; - list fds; + std::list fds; bool deletePaths; public: diff --git a/src/libutil/types.hh b/src/libutil/types.hh index e3aca20c9..130c04451 100644 --- a/src/libutil/types.hh +++ b/src/libutil/types.hh @@ -11,12 +11,11 @@ namespace nix { -using std::list; using std::set; using std::vector; using std::string; -typedef list Strings; +typedef std::list Strings; typedef set StringSet; typedef std::map StringMap; @@ -24,7 +23,7 @@ typedef std::map StringMap; typedef string Path; typedef std::string_view PathView; -typedef list Paths; +typedef std::list Paths; typedef set PathSet; typedef vector> Headers;