Convert all list containers to vectors

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 0d730a4a30f3a26dd3dc1e50b92f15db54481ef8..72c8b07a423a08bacc1e2238fc9354ba70a10230 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -39,22 +39,19 @@ GnuLinker::~GnuLinker()
        delete cxx_linker;
 }
 
-Target *GnuLinker::create_target(const list<Target *> &sources, const string &arg)
+Target *GnuLinker::create_target(const vector<Target *> &sources, const string &arg)
 {
        if(sources.empty())
                throw invalid_argument("GnuLinker::create_target");
-       list<ObjectFile *> objs;
+       vector<ObjectFile *> objs;
+       objs.reserve(sources.size());
        Linker *linker = default_linker;
        for(Target *s: sources)
        {
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(s))
-               {
-                       objs.push_back(obj);
-                       if(obj->get_tool()->get_tag()=="CXX")
-                               linker = cxx_linker;
-               }
-               else
-                       throw invalid_argument("GnuLinker::create_target");
+               ObjectFile &obj = dynamic_cast<ObjectFile &>(*s);
+               objs.push_back(&obj);
+               if(obj.get_tool()->get_tag()=="CXX")
+                       linker = cxx_linker;
        }
 
        const Component &comp = *objs.front()->get_component();