X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildgraph.cpp;h=070f934f6665edaa079885a1f8efa7b1f864e76b;hb=5e00719d0c63e306786ff36df61797cdbc86f3e9;hp=6ae13dcdf304cd5396b02b2a9b3a68bf5af3da0e;hpb=11b4732f81396aa3d8b0fc8928b8e1981032e743;p=builder.git diff --git a/source/buildgraph.cpp b/source/buildgraph.cpp index 6ae13dc..070f934 100644 --- a/source/buildgraph.cpp +++ b/source/buildgraph.cpp @@ -19,13 +19,13 @@ BuildGraph::BuildGraph(Builder &b): 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::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; }