X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ffiletarget.cpp;h=493f0203ee4f155a6e31a5e821a1a1a72c510c35;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=51a92d13b1a11f61c34671a1d8c39adfa710bdcc;hpb=32d6218afe58969f2b18dfa6e262bb9509829abe;p=builder.git

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index 51a92d1..493f020 100644
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
@@ -79,22 +80,24 @@ void FileTarget::check_rebuild()
 		mark_rebuild("Does not exist");
 	else
 	{
-		for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
+		for(Target *d: depends)
 		{
-			FileTarget *ft = dynamic_cast<FileTarget *>(*i);
+			FileTarget *ft = dynamic_cast<FileTarget *>(d);
 			if(ft && ft->get_mtime()>mtime)
-				mark_rebuild((*i)->get_name()+" has changed");
-			else if((*i)->needs_rebuild())
-				mark_rebuild((*i)->get_name()+" needs rebuilding");
+				mark_rebuild(d->get_name()+" has changed");
+			else if(d->needs_rebuild())
+				mark_rebuild(d->get_name()+" needs rebuilding");
+			if(needs_rebuild())
+				break;
 		}
 	}
 
 	if(!needs_rebuild())
 	{
 		// Some side effects might not exist
-		for(Dependencies::iterator i=side_effects.begin(); (i!=side_effects.end() && !needs_rebuild()); ++i)
-			if((*i)->needs_rebuild())
-				mark_rebuild((*i)->get_name()+" needs rebuilding");
+		auto i = find_if(side_effects, [](const Target *s){ return s->needs_rebuild(); });
+		if(i!=side_effects.end())
+			mark_rebuild((*i)->get_name()+" needs rebuilding");
 	}
 
 	if(!needs_rebuild() && package)
@@ -124,12 +127,12 @@ string FileTarget::create_build_signature() const
 	if(nested_build_sig && component)
 	{
 		set<const Tool *> depend_tools;
-		for(Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
-			if((*i)->get_component()==component && (*i)->get_tool())
-				depend_tools.insert((*i)->get_tool());
+		for(Target *d: depends)
+			if(d->get_component()==component && d->get_tool())
+				depend_tools.insert(d->get_tool());
 
-		for(set<const Tool *>::const_iterator i=depend_tools.begin(); i!=depend_tools.end(); ++i)
-			sigs.push_back((*i)->create_build_signature(binfo));
+		for(const Tool *t: depend_tools)
+			sigs.push_back(t->create_build_signature(binfo));
 		sigs.sort();
 		sigs.push_front(tool->create_build_signature(binfo));
 	}