Replace basic for loops with range-based loops or algorithms

[builder.git] / source / msvcarchiver.cpp

diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp
index 1481184d52673adb19dae15e020b623410aa7b30..a724eb16577ae0eb9638a9287b485073fa14a227 100644 (file)
--- a/source/msvcarchiver.cpp
+++ b/source/msvcarchiver.cpp
@@ -25,9 +25,9 @@ Target *MsvcArchiver::create_target(const list<Target *> &sources, const string
                throw invalid_argument("MsvcArchiver::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("MsvcArchiver::create_target");
@@ -57,9 +57,8 @@ Task *MsvcArchiver::run(const Target &target) const
 
        argv.push_back("/OUT:"+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);