X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=203ba5fe5bfbc844373f82b5d89c3ed02a16d725;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=fa8ae62d39606527509d7c9a8b8dd18d77db68e7;hpb=22907c578cb8244c60e8ab1b3466340768491dd1;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index fa8ae62..203ba5f 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -1,8 +1,8 @@
 #ifndef BUILDINFO_H_
 #define BUILDINFO_H_
 
-#include <list>
 #include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include <msp/fs/path.h>
 
@@ -51,6 +51,17 @@ public:
 		CHAINED      //< Include only compilation options
 	};
 
+	struct LanguageStandard
+	{
+		std::string type;
+		unsigned year;
+
+		LanguageStandard(): year(0) { }
+		LanguageStandard(const std::string &);
+
+		std::string str() const;
+	};
+
 	/**
 	A wrapper which tracks the set status of the wrapped variable.  A default
 	value may be provided in initialization without causing it to be treated as
@@ -62,7 +73,7 @@ public:
 	class Tracked
 	{
 	public:
-		typedef T LoadType;
+		using LoadType = T;
 
 	private:
 		T value;
@@ -78,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, std::string> 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::vector<Msp::FS::Path> incpath;
+	std::vector<Msp::FS::Path> local_incpath;
+	std::vector<Msp::FS::Path> libpath;
+	std::vector<std::string> libs;
 	Tracked<LibraryMode> libmode;
 	Tracked<RuntimePathMode> rpath_mode;
-	LibModeMap libmodes;
-	WordList keep_symbols;
-	StandardMap standards;
+	std::map<std::string, LibraryMode> libmodes;
+	std::vector<std::string> keep_symbols;
+	std::map<std::string, LanguageStandard> standards;
 	Tracked<bool> threads;
 	Tracked<bool> debug;
 	Tracked<int> optimize;