Replace basic for loops with range-based loops or algorithms

[builder.git] / source / mingwdlltool.cpp

diff --git a/source/mingwdlltool.cpp b/source/mingwdlltool.cpp
index 03babd4126e09df7ff8869f5da214807094fb530..dc9022e12378c06b56016fbb00e12a0596beb3b1 100644 (file)
--- a/source/mingwdlltool.cpp
+++ b/source/mingwdlltool.cpp
@@ -28,9 +28,8 @@ Target *MingwDllTool::create_target(const list<Target *> &sources, const string
        SharedLibrary &shlib = dynamic_cast<SharedLibrary &>(*sources.front());
 
        list<ObjectFile *> objs;
-       const Target::Dependencies &depends = shlib.get_dependencies();
-       for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+       for(Target *d: shlib.get_dependencies())
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
                        objs.push_back(obj);
 
        ExportDefinitions *exp = new ExportDefinitions(builder, *shlib.get_component(), objs);
@@ -100,12 +99,9 @@ Task *MingwDllTool::run(const Target &target) const
        }
        else
        {
-               const Target::Dependencies &depends = exp->get_dependencies();
-               for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
-               {
-                       if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+               for(Target *d: exp->get_dependencies())
+                       if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
                                argv.push_back(relative(obj->get_path(), work_dir).str());
-               }
 
                // XXX Should use dllexport, but that has some other problems to solve
                argv.push_back("--export-all-symbols");