X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=6429d4fe287504948480bd2e740f02c392a46c36;hb=6b84e1f5673888753cbe566c1365222ed33fd3ac;hp=41dbd437cc836b75697342381f590b1c09f89fc4;hpb=3938f8030b1f62802decce19777ce70fdafaff10;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 41dbd43..6429d4f 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -47,7 +47,7 @@ void CSourceFile::find_dependencies()
 	{
 		IO::BufferedFile in(path.str());
 
-		builder.get_logger().log("files", format("Reading includes from %s", path.str()));
+		builder.get_logger().log("files", "Reading includes from %s", path.str());
 
 		parse_includes(in);
 		cache.set_values(this, "includes", includes);
@@ -55,9 +55,11 @@ void CSourceFile::find_dependencies()
 
 	const BuildInfo &build_info = component->get_build_info_for_path(path);
 	const auto &incpath = build_info.incpath;
-	VirtualFileSystem::SearchPath local_incpath = incpath;
-	local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
-	local_incpath.push_front(FS::dirname(path).str());
+	VirtualFileSystem::SearchPath local_incpath;
+	local_incpath.reserve(1+build_info.local_incpath.size()+incpath.size());
+	local_incpath.push_back(FS::dirname(path).str());
+	local_incpath.insert(local_incpath.end(), build_info.local_incpath.begin(), build_info.local_incpath.end());
+	local_incpath.insert(local_incpath.end(), incpath.begin(), incpath.end());
 
 	Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
 	if(compiler)