X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildgraph.cpp;h=070f934f6665edaa079885a1f8efa7b1f864e76b;hb=82c7d6187fdaeaa1b9cfbd6637d9b047a78f17ec;hp=94b5ed6ffd2dcfe578249dc2739a39c2a0014191;hpb=09366b5da31707942f66e386cd0c07e5ece17b7f;p=builder.git

diff --git a/source/buildgraph.cpp b/source/buildgraph.cpp
index 94b5ed6..070f934 100644
--- a/source/buildgraph.cpp
+++ b/source/buildgraph.cpp
@@ -14,18 +14,18 @@ BuildGraph::BuildGraph(Builder &b):
 	Target *world = new VirtualTarget(builder, "world");
 	world->add_dependency(*new VirtualTarget(builder, "default"));
 	world->add_dependency(*new VirtualTarget(builder, "install"));
-	world->add_dependency(*new VirtualTarget(builder, "tarballs"));
+	world->add_dependency(*new VirtualTarget(builder, "archives"));
 }
 
 BuildGraph::~BuildGraph()
 {
-	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-		delete i->second;
+	for(const auto &kvp: targets)
+		delete kvp.second;
 }
 
 Target *BuildGraph::get_target(const string &n) const
 {
-	TargetMap::const_iterator i = targets.find(n);
+	auto i = targets.find(n);
 	if(i!=targets.end())
 		return i->second;
 	return 0;
@@ -33,7 +33,7 @@ Target *BuildGraph::get_target(const string &n) const
 
 void BuildGraph::add_target(Target *t)
 {
-	targets.insert(TargetMap::value_type(t->get_name(), t));
+	targets.insert({ t->get_name(), t });
 }
 
 void BuildGraph::add_primary_target(Target &t)
@@ -69,16 +69,16 @@ void BuildGraph::prepare()
 
 void BuildGraph::force_full_rebuild()
 {
-	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->is_buildable() && !i->second->needs_rebuild())
-			i->second->force_rebuild();
+	for(const auto &kvp: targets)
+		if(kvp.second->is_buildable() && !kvp.second->needs_rebuild())
+			kvp.second->force_rebuild();
 }
 
 unsigned BuildGraph::count_rebuild_targets() const
 {
 	unsigned count = 0;
-	for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->is_buildable() && i->second->needs_rebuild())
+	for(const auto &kvp: targets)
+		if(kvp.second->is_buildable() && kvp.second->needs_rebuild())
 			++count;
 	return count;
 }