system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"um");
string path;
- for(SearchPath::const_iterator i=system_path.begin(); i!=system_path.end(); ++i)
+ for(const FS::Path &p: system_path)
{
- append(path, ";", i->str());
- builder.get_logger().log("tools", format("Got %s system path: %s", tag, *i));
+ append(path, ";", p.str());
+ builder.get_logger().log("tools", format("Got %s system path: %s", tag, p));
}
setenv("INCLUDE", path);
if(binfo.standards.count(tag))
{
- string std = get_item(binfo.standards, tag);
- if(std!="c++11" && std!="c99")
- argv.push_back("/std:"+std);
+ const BuildInfo::LanguageStandard &std = get_item(binfo.standards, tag);
+ if((tag=="CXX" && std.year>2011) || (tag=="CC" && std.year>1999))
+ argv.push_back("/std:"+std.str());
}
if(binfo.warning_level>=1)
else
argv.push_back("/w");
- for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+ for(const FS::Path &p: binfo.local_incpath)
{
argv.push_back("/I");
- argv.push_back(i->str());
+ argv.push_back(p.str());
}
- for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
+ for(const FS::Path &p: binfo.incpath)
{
argv.push_back("/I");
- argv.push_back(i->str());
+ argv.push_back(p.str());
}
- for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+ for(const auto &kvp: binfo.defines)
{
argv.push_back("/D");
- if(i->second.empty())
- argv.push_back(i->first);
+ if(kvp.second.empty())
+ argv.push_back(kvp.first);
else
- argv.push_back(format("%s=%s", i->first, i->second));
+ argv.push_back(format("%s=%s", kvp.first, kvp.second));
}
if(binfo.debug)