X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=26afabffd4db6f323824ddeba99f98954c78c926;hb=c8c51fac9453a677fc3e6932c4730f35e237af89;hp=c0584002233512392849dd7a6097de40bc02f1a6;hpb=1c66151c44b4f4fb567da5ec8b75f066cccc5421;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index c058400..26afabf 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>
 
@@ -54,9 +54,9 @@ public:
 	struct LanguageStandard
 	{
 		std::string type;
-		unsigned year;
+		unsigned year = 0;
 
-		LanguageStandard(): year(0) { }
+		LanguageStandard() = default;
 		LanguageStandard(const std::string &);
 
 		std::string str() const;
@@ -73,47 +73,39 @@ public:
 	class Tracked
 	{
 	public:
-		typedef T LoadType;
+		using LoadType = T;
 
 	private:
-		T value;
-		bool set;
+		T value{};
+		bool set = false;
 
 	public:
-		Tracked(): value(T()), set(false) { }
-		Tracked(T v): value(v), set(false) { }
-		Tracked(const Tracked &t): value(t.value), set(t.set) { }
+		Tracked() = default;
+		Tracked(T v): value(v) { }
+		Tracked(const Tracked &t) = default;
 		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, LanguageStandard> StandardMap;
-
 	Tracked<Msp::FS::Path> sysroot;
-	DefineMap defines;
-	PathList incpath;
-	PathList local_incpath;
-	PathList libpath;
-	WordList libs;
-	Tracked<LibraryMode> libmode;
-	Tracked<RuntimePathMode> rpath_mode;
-	LibModeMap libmodes;
-	WordList keep_symbols;
-	StandardMap standards;
-	Tracked<bool> threads;
-	Tracked<bool> debug;
-	Tracked<int> optimize;
-	Tracked<bool> strip;
-	Tracked<unsigned> warning_level;
-	Tracked<bool> fatal_warnings;
-
-	BuildInfo();
+	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 = DYNAMIC;
+	Tracked<RuntimePathMode> rpath_mode = NO_RPATH;
+	std::map<std::string, LibraryMode> libmodes;
+	std::vector<std::string> keep_symbols;
+	std::map<std::string, LanguageStandard> standards;
+	Tracked<bool> threads = false;
+	Tracked<bool> debug = false;
+	Tracked<int> optimize = 0;
+	Tracked<bool> strip = false;
+	Tracked<unsigned> warning_level = 0;
+	Tracked<bool> fatal_warnings = false;
 
 	/** Returns the library mode for linking a particular library.  If no mode
 	has been specified for that library, the the global library mode is