X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=3903c6a079983975fa42cc468c6552fd32cf1a4f;hb=3043044d8ef02ef77def454fdede87927f5aa1f8;hp=2752ff4ed969db58745094d0d38249c752fa976b;hpb=e87f8e48e17754a8413bda66e6da67daf933cee2;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 2752ff4..3903c6a 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -254,20 +254,20 @@ Task *GnuCompiler::run(const Target &target) const
 	const FS::Path &sysroot = binfo.sysroot;
 	if(!sysroot.empty())
 		argv.push_back("--sysroot="+sysroot.str());
-	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("-iquote");
-		argv.push_back(i->str());
+		argv.push_back(p.str());
 	}
-	for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		argv.push_back("-I"+i->str());
+	for(const FS::Path &p: binfo.incpath)
+		argv.push_back("-I"+p.str());
 
-	for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+	for(const auto &kvp: binfo.defines)
 	{
-		if(i->second.empty())
-			argv.push_back(format("-D%s", i->first));
+		if(kvp.second.empty())
+			argv.push_back(format("-D%s", kvp.first));
 		else
-			argv.push_back(format("-D%s=%s", i->first, i->second));
+			argv.push_back(format("-D%s=%s", kvp.first, kvp.second));
 	}
 
 	if(binfo.debug)