X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvirtualfilesystem.cpp;h=16d4de8584a37dab7e8c2d426d8125fb56569351;hb=f0c0d720edc01f5faa72bb4ff4bf655445842678;hp=c9bfd23b0c564700ea7e1d13542c0c1118cbf6fc;hpb=799d256e952913524c5e51a59c836e7a4cb52ea5;p=builder.git

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index c9bfd23..16d4de8 100644
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -15,11 +15,6 @@
 using namespace std;
 using namespace Msp;
 
-VirtualFileSystem::VirtualFileSystem(Builder &b):
-	builder(b)
-{
-}
-
 FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const
 {
 	auto i = targets.find(p.str());
@@ -32,7 +27,7 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
 {
 	targets.insert({ path, t });
 	nonexistent.erase(path);
-	builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name()));
+	builder.get_logger().log("vfs", "Path %s registered to %s", path, t->get_name());
 }
 
 FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
@@ -56,16 +51,16 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
 		FS::Path filename = p/name;
 		if(FileTarget *tgt = get_target(filename))
 		{
-			builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, p.str(), tgt->get_type()));
+			builder.get_logger().log("vfs", "Header %s found in %s as existing %s", name, p.str(), tgt->get_type());
 			return tgt;
 		}
 		else if(file_exists(filename))
 		{
-			builder.get_logger().log("vfs", format("Header %s found in %s", name, p.str()));
+			builder.get_logger().log("vfs", "Header %s found in %s", name, p.str());
 			return dynamic_cast<FileTarget *>(tool->create_source(filename));
 		}
 
-		builder.get_logger().log("vfs", format("Header %s not found in %s", name, p.str()));
+		builder.get_logger().log("vfs", "Header %s not found in %s", name, p.str());
 	}
 
 	return 0;
@@ -84,7 +79,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 
 	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,24 +88,24 @@ 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;
 			if(FileTarget *tgt = get_target(filename))
 			{
-				builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type()));
+				builder.get_logger().log("vfs", "Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type());
 				return tgt;
 			}
 			else if(file_exists(filename))
 			{
-				builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, p.str()));
+				builder.get_logger().log("vfs", "Library %s (%s) found in %s", lib, *j, p.str());
 				if(cur_names==&shared_names)
 				{
 					if(use_import_lib)
@@ -133,7 +128,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
 			}
 		}
 
-		builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str()));
+		builder.get_logger().log("vfs", "Library %s not found in %s", lib, p.str());
 	}
 
 	return 0;
@@ -168,16 +163,16 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
 		FS::Path filename = p/name;
 		if(FileTarget *tgt = get_target(filename))
 		{
-			builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, p, tgt->get_type()));
+			builder.get_logger().log("vfs", "Binary %s found in %s as existing %s", name, p, tgt->get_type());
 			return tgt;
 		}
 		else if(file_exists(filename))
 		{
-			builder.get_logger().log("vfs", format("Binary %s found in %s", name, p));
+			builder.get_logger().log("vfs", "Binary %s found in %s", name, p);
 			return new Executable(builder, filename);
 		}
 
-		builder.get_logger().log("vfs", format("Binary %s not found in %s", name, p));
+		builder.get_logger().log("vfs", "Binary %s not found in %s", name, p);
 	}
 
 	return 0;