FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const
{
- TargetMap::const_iterator i = targets.find(p.str());
+ auto i = targets.find(p.str());
if(i!=targets.end())
return static_cast<FileTarget *>(i->second);
return 0;
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()));
}
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());
}
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());
}