From 276a0796a97b0a312c0071bba0bf924b5f5c6eee Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
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/scope.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build/scope.cxx')

diff --git a/build/scope.cxx b/build/scope.cxx
index 60c83b4..f907163 100644
--- a/build/scope.cxx
+++ b/build/scope.cxx
@@ -33,7 +33,7 @@ namespace build
   // scope_map
   //
   scope_map scopes;
-  scope* root_scope;
+  scope* global_scope;
 
   pair<scope&, bool> scope_map::
   insert (const path& k)
@@ -46,7 +46,7 @@ namespace build
       scope* p (nullptr);
 
       // Update scopes of which we are a new parent (unless this is the
-      // root scope).
+      // global scope).
       //
       if (size () > 1)
       {
@@ -102,7 +102,7 @@ namespace build
       if (i != end ())
         return i->second;
 
-      assert (!d.empty ()); // We should have the root scope.
+      assert (!d.empty ()); // We should have the global scope.
     }
   }
 }
-- 
cgit v1.1