When combining build info, keep the highest standard versions

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index e2df34c06e3ec91cb56500f97c3bed1b53b23d02..af4865498c5fd61c2105d987f783ff23d21d5466 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -51,8 +51,20 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
                defines[i->first] = i->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;
+       {
+               StandardMap::iterator j = standards.find(i->first);
+               if(j==standards.end())
+                       standards.insert(*i);
+               else if(i->second.type!=j->second.type || i->second.year!=j->second.year)
+               {
+                       if(!i->second.type.compare(0, 3, "gnu"))
+                               j->second.type = i->second.type;
+                       if(i->second.year>j->second.year)
+                               j->second.year = i->second.year;
+               }
+       }
 
        if(level!=CHAINED)
        {
@@ -84,6 +96,23 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 }
 
 
+BuildInfo::LanguageStandard::LanguageStandard(const string &std)
+{
+       string::size_type num = string::npos;
+       for(string::size_type i=0; (num==string::npos && i<std.size()); ++i)
+               if(isdigit(static_cast<unsigned char>(std[i])))
+                       num = i;
+       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)
 {