X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;fp=source%2Fgnulinker.cpp;h=c592cc86cf1e7bd888eefa753957f5988bea2e0b;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=2d37a4d93533b4486d865a043f691f3725ff4aa5;hpb=32d6218afe58969f2b18dfa6e262bb9509829abe;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 2d37a4d..c592cc8 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -45,9 +45,9 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
 		throw invalid_argument("GnuLinker::create_target");
 	list<ObjectFile *> objs;
 	Linker *linker = default_linker;
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+	for(Target *s: sources)
 	{
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(s))
 		{
 			objs.push_back(obj);
 			if(obj->get_tool()->get_tag()=="CXX")
@@ -280,8 +280,8 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		argv.push_back("-Wl,-rpath-link,"+lib_dir.str());
 	}
 
-	for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-		argv.push_back("-L"+i->str());
+	for(const FS::Path &p: binfo.libpath)
+		argv.push_back("-L"+p.str());
 	if(binfo.strip)
 		argv.push_back("-s");
 	if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
@@ -294,16 +294,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	argv.push_back("-o");
 	argv.push_back(relative(bin.get_path(), work_dir).str());
 
-	for(BuildInfo::WordList::const_iterator i=binfo.keep_symbols.begin(); i!=binfo.keep_symbols.end(); ++i)
-		argv.push_back("-u"+*i);
+	for(const string &s: binfo.keep_symbols)
+		argv.push_back("-u"+s);
 
 	bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
 
-	const Target::Dependencies &depends = target.get_dependencies();
-	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Target *d: target.get_dependencies())
 	{
-		FileTarget *file = dynamic_cast<FileTarget *>(*i);
-		Target *tgt = (*i)->get_real_target();
+		FileTarget *file = dynamic_cast<FileTarget *>(d);
+		Target *tgt = d->get_real_target();
 
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
@@ -325,11 +324,11 @@ Task *GnuLinker::Linker::run(const Target &target) const
 		}
 	}
 
-	for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-		if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
+	for(const string &l: binfo.libs)
+		if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
 		{
 			argv.push_back("-framework");
-			argv.push_back(i->substr(0, i->size()-10));
+			argv.push_back(l.substr(0, l.size()-10));
 		}
 
 	if(static_link_ok)