From 276a0796a97b0a312c0071bba0bf924b5f5c6eee Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 31 Mar 2015 06:36:46 +0200 Subject: Rename root_scope to global_scope To avoid confusion with project's root scopes. --- build/dump.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'build/dump.cxx') diff --git a/build/dump.cxx b/build/dump.cxx index 45ec584..0287d4a 100644 --- a/build/dump.cxx +++ b/build/dump.cxx @@ -104,16 +104,16 @@ namespace build if (ts == &p) { - // If this is the ultimate root scope, check that this target - // hasn't been handled by the src logic below. + // If this is the global scope, check that this target hasn't + // been handled by the src logic below. // - f = (ts != root_scope || rts.find (&t) == rts.end ()); + f = (ts != global_scope || rts.find (&t) == rts.end ()); } - // If this target is in the ultimate root scope and we have a - // corresponding src directory (i.e., we are a scope inside a - // project), check whether this target is in our src. + // If this target is in the global scope and we have a corresponding + // src directory (i.e., we are a scope inside a project), check + // whether this target is in our src. // - else if (ts == root_scope && p.src_path_ != nullptr) + else if (ts == global_scope && p.src_path_ != nullptr) { if (t.dir.sub (p.src_path ())) { @@ -151,9 +151,9 @@ namespace build string ind; set rts; auto i (scopes.begin ()); - scope& r (i->second); // Root scope. - assert (&r == root_scope); - dump_scope (r, ++i, ind, rts); + scope& g (i->second); // Global scope. + assert (&g == global_scope); + dump_scope (g, ++i, ind, rts); cerr << endl; } } -- cgit v1.1