Convert all list containers to vectors

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index be88b41bf31d61a34257ea75bfc726df4dca5adf..c51596685d8927debc0afb5e5bb481b327f2dffb 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -11,12 +11,12 @@ StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
        FileTarget(b, p)
 { }
 
-StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
+StaticLibrary::StaticLibrary(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
        FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
        component = &c;
-       for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_dependency(**i);
+       for(ObjectFile *o: objs)
+               add_dependency(*o);
 
        install_location = "lib";
        nested_build_sig = true;
@@ -26,7 +26,7 @@ StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFi
 string StaticLibrary::generate_filename(const Component &comp)
 {
        const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-       return arch.get_static_library_patterns().front().apply(comp.get_name());
+       return arch.create_filename<StaticLibrary>(comp.get_name());
 }
 
 void StaticLibrary::add_required_library(const string &lib)