X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=e9b0bc8dca7d9c67a7e10d251120de4ac9e593b9;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=41dbd437cc836b75697342381f590b1c09f89fc4;hpb=9f885c3eec8f065b7dc400acfb9dd67158284fcf;p=builder.git diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp index 41dbd43..e9b0bc8 100644 --- a/source/csourcefile.cpp +++ b/source/csourcefile.cpp @@ -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)