Replace basic for loops with range-based loops or algorithms

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index fcf30f1d1fca03170f868ac7423ced7d37605683..c8011d7c2a24c0cec015d751fca615fc8df23de4 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
@@ -22,8 +23,8 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
        objects(objs)
 {
        component = &c;
-       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               add_dependency(**i);
+       for(ObjectFile *o: objects)
+               add_dependency(*o);
 
        nested_build_sig = true;
        arch_in_build_sig = true;
@@ -31,8 +32,8 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
 
 void Binary::collect_build_info(BuildInfo &binfo) const
 {
-       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               if(const Tool *obj_tool = (*i)->get_tool())
+       for(ObjectFile *o: objects)
+               if(const Tool *obj_tool = o->get_tool())
                        binfo.update_from(obj_tool->get_build_info());
 
        Target::collect_build_info(binfo);
@@ -49,7 +50,7 @@ void Binary::find_dependencies()
        list<Target *> dep_libs;
        set<string> missing_libs;
        queue.push_back(this);
-       for(list<Target *>::iterator j=queue.begin(); j!=queue.end(); ++j)
+       for(auto j=queue.begin(); j!=queue.end(); ++j)
        {
                Target *tgt = *j;
 
@@ -63,15 +64,15 @@ void Binary::find_dependencies()
                                static_binfo.threads = true;
                }
 
-               list<Target *>::iterator insert_pos = j;
+               auto insert_pos = j;
                ++insert_pos;
-               for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
+               for(const string &l: binfo.libs)
                {
-                       if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
+                       if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
                                continue;
 
-                       BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
-                       Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
+                       BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(l);
+                       Target *lib = builder.get_vfs().find_library(l, binfo.libpath, libmode);
                        if(lib)
                        {
                                Target *real = lib->get_real_target();
@@ -80,8 +81,8 @@ void Binary::find_dependencies()
                                else
                                        dep_libs.push_back(lib);
                        }
-                       else if(missing_libs.insert(*i).second)
-                               problems.push_back(format("Required library %s not found", *i));
+                       else if(missing_libs.insert(l).second)
+                               problems.push_back(format("Required library %s not found", l));
                }
        }
 
@@ -90,12 +91,7 @@ void Binary::find_dependencies()
 
        /* Add only the last occurrence of each library to the actual dependencies.
        This ensures that static library ordering is correct. */
-       for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
-       {
-               bool last = true;
-               for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
-                       last = (j==i || *j!=*i);
-               if(last)
+       for(auto i=dep_libs.begin(); i!=dep_libs.end(); ++i)
+               if(!any_of(next(i), dep_libs.end(), [i](Target *d){ return d==*i; }))
                        add_dependency(**i);
-       }
 }