Replace basic for loops with range-based loops or algorithms

[builder.git] / source / gnuarchiver.cpp

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 170007028a5201f26bf64160402a2bab3f8bebd7..7e79ec08d7749efab9a52567df947b2fdf64f545 100644 (file)
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -27,9 +27,9 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
                throw invalid_argument("GnuArchiver::create_target");
 
        list<ObjectFile *> objs;
-       for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+       for(Target *s: sources)
        {
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(s))
                        objs.push_back(obj);
                else
                        throw invalid_argument("GnuArchiver::create_target");
@@ -59,9 +59,8 @@ Task *GnuArchiver::run(const Target &target) const
 
        argv.push_back(relative(lib.get_path(), work_dir).str());
 
-       const Target::Dependencies &deps = lib.get_dependencies();
-       for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+       for(Target *d: lib.get_dependencies())
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
                        argv.push_back(relative(obj->get_path(), work_dir).str());
 
        return new ExternalTask(argv, work_dir);