Convert all list containers to vectors

[builder.git] / source / binarypackage.cpp

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index 02b9be21d7b58966a323ea66f295af14f0158d7f..66d1225f81b0643cea6eb4dd384c53366aa90690 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -60,7 +60,7 @@ void BinaryPackage::do_prepare()
        bool has_relative_paths = any_of(export_binfo.libpath.begin(), export_binfo.libpath.end(), is_relative) ||
                any_of(export_binfo.incpath.begin(), export_binfo.incpath.end(), is_relative);
 
-       list<FS::Path> bases;
+       vector<FS::Path> bases;
 
        /* If we have any relative paths that need resolving, or we have no paths at
        all and are not using pkg-config, look for files in prefix */
@@ -83,7 +83,7 @@ void BinaryPackage::do_prepare()
                                prefix /= arch.get_cross_prefix();
                }
 
-               BuildInfo::PathList libpath = export_binfo.libpath;
+               VirtualFileSystem::SearchPath libpath = export_binfo.libpath;
                if(!system && libpath.empty())
                        libpath.push_back("lib");
                for(FS::Path &p: libpath)
@@ -93,7 +93,7 @@ void BinaryPackage::do_prepare()
                for(const string &l: export_binfo.libs)
                        all_found &= (builder.get_vfs().find_library(l, libpath, export_binfo.libmode, system)!=0);
 
-               BuildInfo::PathList incpath = export_binfo.incpath;
+               VirtualFileSystem::SearchPath incpath = export_binfo.incpath;
                if(!system && incpath.empty())
                        incpath.push_back("include");
                for(FS::Path &p: incpath)
@@ -135,7 +135,7 @@ void BinaryPackage::do_prepare()
 
        if(!static_binfo.libs.empty())
        {
-               BuildInfo::PathList combined_libpath = static_binfo.libpath;
+               VirtualFileSystem::SearchPath combined_libpath = static_binfo.libpath;
                combined_libpath.insert(combined_libpath.end(), export_binfo.libpath.begin(), export_binfo.libpath.end());
 
                for(const string &l: export_binfo.libs)