Convert all list containers to vectors

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 0c3ee36ec830e09864ea6416b113109c15b5ff3f..2fecdf0fc50c9427fd1d06c194b597b7b41ff864 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -30,7 +30,7 @@ FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const
 
 void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
 {
-       targets.insert(TargetMap::value_type(path.str(), t));
+       targets.insert({ path, t });
        nonexistent.erase(path);
        builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name()));
 }
@@ -44,10 +44,10 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
 
        tool->prepare();
 
-       list<FS::Path> combined_path(path.begin(), path.end());
+       SearchPath combined_path = path;
        if(use_syspath)
        {
-               const Tool::SearchPath &syspath = tool->get_system_path();
+               const SearchPath &syspath = tool->get_system_path();
                combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
        }
 
@@ -73,18 +73,18 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
 
 FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, BuildInfo::LibraryMode mode, bool use_syspath)
 {
-       list<FS::Path> combined_path(path.begin(), path.end());
+       SearchPath combined_path = path;
        if(use_syspath)
        {
                Tool &linker = builder.get_toolchain().get_tool("LINK");
                linker.prepare();
-               const Tool::SearchPath &syspath = linker.get_system_path();
+               const SearchPath &syspath = linker.get_system_path();
                combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
        }
 
        const Architecture &arch = builder.get_current_arch();
 
-       list<string> shared_names;
+       vector<string> shared_names;
        bool use_import_lib = false;
        if(mode!=BuildInfo::FORCE_STATIC)
        {
@@ -93,13 +93,13 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
        }
 
-       list<string> static_names;
+       vector<string> static_names;
        if(mode!=BuildInfo::FORCE_DYNAMIC)
                static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
        for(const FS::Path &p: combined_path)
        {
-               const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
+               const vector<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
                for(auto j=cur_names->begin(); j!=cur_names->end(); )
                {
                        FS::Path filename = p / *j;
@@ -146,17 +146,21 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
                path.push_back("/");
        else
        {
-               string env_path = Msp::getenv("PATH");
-               if(!env_path.empty())
+               if(sys_bin_path.empty())
                {
-                       for(const string &p: split(env_path, ':'))
-                               path.push_back(p);
-               }
-               else
-               {
-                       path.push_back("/bin");
-                       path.push_back("/usr/bin");
+                       string env_path = Msp::getenv("PATH");
+                       if(!env_path.empty())
+                       {
+                               for(const string &p: split(env_path, ':'))
+                                       sys_bin_path.push_back(p);
+                       }
+                       else
+                       {
+                               sys_bin_path.push_back("/bin");
+                               sys_bin_path.push_back("/usr/bin");
+                       }
                }
+               path = sys_bin_path;
        }
 
        for(const FS::Path &p: path)