Remove most container typedefs and refactor others

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index c0584002233512392849dd7a6097de40bc02f1a6..f84315c74369b7b73f6f4e839ff0a8701193627f 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -73,7 +73,7 @@ public:
        class Tracked
        {
        public:
-               typedef T LoadType;
+               using LoadType = T;
 
        private:
                T value;
@@ -89,23 +89,17 @@ public:
                operator const T &() const { return value; }
        };
 
-       typedef std::map<std::string, std::string> DefineMap;
-       typedef std::list<Msp::FS::Path> PathList;
-       typedef std::list<std::string> WordList;
-       typedef std::map<std::string, LibraryMode> LibModeMap;
-       typedef std::map<std::string, LanguageStandard> StandardMap;
-
        Tracked<Msp::FS::Path> sysroot;
-       DefineMap defines;
-       PathList incpath;
-       PathList local_incpath;
-       PathList libpath;
-       WordList libs;
+       std::map<std::string, std::string> defines;
+       std::list<Msp::FS::Path> incpath;
+       std::list<Msp::FS::Path> local_incpath;
+       std::list<Msp::FS::Path> libpath;
+       std::list<std::string> libs;
        Tracked<LibraryMode> libmode;
        Tracked<RuntimePathMode> rpath_mode;
-       LibModeMap libmodes;
-       WordList keep_symbols;
-       StandardMap standards;
+       std::map<std::string, LibraryMode> libmodes;
+       std::list<std::string> keep_symbols;
+       std::map<std::string, LanguageStandard> standards;
        Tracked<bool> threads;
        Tracked<bool> debug;
        Tracked<int> optimize;