X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=783583f7798d2f9228b92a954bb93e387b7606cd;hb=3938f8030b1f62802decce19777ce70fdafaff10;hp=7855e04ac99bc148bbbc2dbd4c685fafd01214e3;hpb=1ec533a7777be4dce9c8b6bbb1cbc32d38098ae4;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 7855e04..783583f 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -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,12 +73,12 @@ 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());
 	}