Refactor logger to do message formatting internally

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 954fdba72927c8b4417d177094b2de849e3306c8..6429d4fe287504948480bd2e740f02c392a46c36 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -47,17 +47,19 @@ 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);
        }
 
        const BuildInfo &build_info = component->get_build_info_for_path(path);
-       const BuildInfo::PathList &incpath = build_info.incpath;
-       BuildInfo::PathList 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());
+       const auto &incpath = build_info.incpath;
+       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)