X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=a89feb245c7c13ad50f4ad72920202ba328caed2;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=b98cd75f02c49108e047b8bebc42b2321d1b86bc;hpb=eabb3f5b9b0d32adda71d4dd7e56796f7ea3bdd2;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index b98cd75..a89feb2 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,5 +1,5 @@
-#include <algorithm>
 #include <cstdlib>
+#include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
@@ -42,8 +42,8 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
 
 SourcePackage::~SourcePackage()
 {
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		delete *i;
+	for(Component *c: components)
+		delete c;
 }
 
 FS::Path SourcePackage::get_temp_directory() const
@@ -73,9 +73,9 @@ FS::Path SourcePackage::get_output_directory() const
 
 const Component &SourcePackage::get_component(const string &n) const
 {
-	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
-		if((*i)->get_name()==n)
-			return **i;
+	auto i = find_if(components, [&n](const Component *c){ return c->get_name()==n; });
+	if(i!=components.end())
+		return **i;
 	throw key_error(n);
 }
 
@@ -106,12 +106,12 @@ void SourcePackage::do_prepare()
 	build_info.incpath.push_back((builder.get_prefix()/"include").str());
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
+	for(const Feature &f: features)
 	{
-		string ident = "WITH_"+toupper(i->name);
-		string value = config.get_option("with_"+i->name).value;
+		string ident = "WITH_"+toupper(f.name);
+		string value = config.get_option("with_"+f.name).value;
 
-		if(i->choices.empty())
+		if(f.choices.empty())
 		{
 			if(!lexical_cast<bool>(value))
 				continue;
@@ -119,22 +119,22 @@ void SourcePackage::do_prepare()
 		}
 
 		build_info.defines[ident] = value;
-		if(i->exported)
+		if(f.exported)
 			export_binfo.defines[ident] = value;
 	}
 
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+	for(Component *c: components)
 	{
-		(*i)->prepare();
-		(*i)->create_build_info();
+		c->prepare();
+		c->create_build_info();
 
-		(*i)->update_exported_build_info(export_binfo);
+		c->update_exported_build_info(export_binfo);
 	}
 
 	cache.load();
 
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		(*i)->create_targets();
+	for(Component *c: components)
+		c->create_targets();
 
 	const Architecture &arch = builder.get_native_arch();
 	if(!export_binfo.libs.empty())