X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=0ff4286c5cb87bb6270a5978c304c8969c29bed0;hb=903a5727ef1f8a7f540e162139396163c736d484;hp=dee807b2306027aa1a503e261f241dfbe4b4a0d7;hpb=34845849442814cbc29585fb3d86ccb2da5940de;p=builder.git diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp index dee807b..0ff4286 100644 --- a/source/csourcefile.cpp +++ b/source/csourcefile.cpp @@ -37,8 +37,7 @@ void CSourceFile::find_depends() { IO::BufferedFile in(path.str()); - if(builder.get_verbose()>=4) - IO::print("Reading includes from %s\n", path.str()); + builder.get_logger().log("files", format("Reading includes from %s", path.str())); Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]"); @@ -50,8 +49,8 @@ void CSourceFile::find_depends() deps_cache.set_deps(relname, includes); } - const StringList &incpath = comp->get_build_info().incpath; - StringList local_incpath = incpath; + const BuildInfo::PathList &incpath = comp->get_build_info().incpath; + BuildInfo::PathList local_incpath = incpath; local_incpath.push_front(FS::dirname(path).str()); for(list::iterator i=includes.begin(); i!=includes.end(); ++i)