Remove the now obsolete SubTool class

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 0034ebd0e564870c6ed101835f52cd130ef42506..bc766059879d210023af0d64c378477ffa28fcc5 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,10 +11,6 @@
 using namespace std;
 using namespace Msp;
 
-CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-       SourceFile(b, p)
-{ }
-
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
        SourceFile(b, c, p)
 {
@@ -47,27 +43,26 @@ 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)
                compiler->prepare();
-       for(IncludeList::iterator i=includes.begin(); i!=includes.end(); ++i)
-       {
-               Target *hdr = builder.get_vfs().find_header(i->substr(1), compiler, ((*i)[0]=='"' ? local_incpath : incpath));
-               if(hdr)
+       for(const string &i: includes)
+               if(Target *hdr = builder.get_vfs().find_header(i.substr(1), compiler, (i[0]=='"' ? local_incpath : incpath)))
                        add_transitive_dependency(*hdr);
-       }
 }
 
 void CSourceFile::modified()