X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=f84315c74369b7b73f6f4e839ff0a8701193627f;hb=3938f8030b1f62802decce19777ce70fdafaff10;hp=ccfa2b630bc9f47a03e471c846e8bc7e2e3c8838;hpb=fe305f49aae7b7dff4c6be6f7bb8d403ccf53768;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index ccfa2b6..f84315c 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.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;
@@ -71,29 +82,24 @@ public:
 	public:
 		Tracked(): value(T()), set(false) { }
 		Tracked(T v): value(v), set(false) { }
+		Tracked(const Tracked &t): value(t.value), set(t.set) { }
 		Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; }
 
 		Tracked &operator=(const T &v) { value = v; set = true; return *this; }
 		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::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;