X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=29254489cf5e6c4b8e747e2ad59cd554492c1a0f;hb=690b9c5f340504517cf6ba8aad0c168dcdff4efa;hp=e2df34c06e3ec91cb56500f97c3bed1b53b23d02;hpb=fe305f49aae7b7dff4c6be6f7bb8d403ccf53768;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index e2df34c..2925448 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <set>
+#include <msp/core/algorithm.h>
 #include <msp/strings/format.h>
 #include "buildinfo.h"
 
@@ -14,7 +14,7 @@ template<typename T>
 void unique(list<T> &l)
 {
 	set<T> seen;
-	for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+	for(auto i=l.begin(); i!=l.end(); )
 	{
 		if(seen.count(*i))
 			l.erase(i++);
@@ -39,7 +39,7 @@ BuildInfo::BuildInfo():
 
 BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
 {
-	LibModeMap::const_iterator i = libmodes.find(lib);
+	auto i = libmodes.find(lib);
 	if(i!=libmodes.end())
 		return i->second;
 	return libmode;
@@ -47,12 +47,24 @@ BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
 
 void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
-	for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
-		defines[i->first] = i->second;
+	for(const auto &kvp: bi.defines)
+		defines[kvp.first] = kvp.second;
 	incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
 	threads = bi.threads;
-	for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
-		standards[i->first] = i->second;
+
+	for(const auto &kvp: bi.standards)
+	{
+		auto j = standards.find(kvp.first);
+		if(j==standards.end())
+			standards.insert(kvp);
+		else if(kvp.second.type!=j->second.type || kvp.second.year!=j->second.year)
+		{
+			if(!kvp.second.type.compare(0, 3, "gnu"))
+				j->second.type = kvp.second.type;
+			if(kvp.second.year>j->second.year)
+				j->second.year = kvp.second.year;
+		}
+	}
 
 	if(level!=CHAINED)
 	{
@@ -66,8 +78,8 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 		local_incpath.insert(local_incpath.begin(), bi.local_incpath.begin(), bi.local_incpath.end());
 		libmode = bi.libmode;
 		rpath_mode = bi.rpath_mode;
-		for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
-			libmodes[i->first] = i->second;
+		for(const auto &kvp: bi.libmodes)
+			libmodes[kvp.first] = kvp.second;
 		keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
 		debug = bi.debug;
 		optimize = bi.optimize;
@@ -84,6 +96,21 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 }
 
 
+BuildInfo::LanguageStandard::LanguageStandard(const string &std)
+{
+	auto i = find_if(std, [](char c){ return isdigit(static_cast<unsigned char>(c)); });
+	string::size_type num = i-std.begin();
+	type = std.substr(0, num);
+	year = lexical_cast<unsigned>(std.substr(num));
+	year += (year<70 ? 2000 : 1900);
+}
+
+string BuildInfo::LanguageStandard::str() const
+{
+	return format("%s%02d", type, year%100);
+}
+
+
 BuildInfo::Loader::Loader(BuildInfo &bi):
 	DataFile::ObjectLoader<BuildInfo>(bi)
 {