- for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
- defines[i->first] = i->second;
- incpath.insert(incpath.end(), bi.incpath.begin(), bi.incpath.end());
+ 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(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;
+ }
+ }
+