From 7eed858cac7e8ff78626bdc5d63a7f36ca8f8010 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 4 Mar 2015 16:33:51 +0200
Subject: Move roots and bases to appropriate scopes

---
 build/scope | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'build/scope')

diff --git a/build/scope b/build/scope
index 2746ff8..b4f492d 100644
--- a/build/scope
+++ b/build/scope
@@ -26,18 +26,18 @@ namespace build
     // Variable lookup.
     //
   public:
-    value*
-    operator[] (const variable&);
+    value_proxy
+    operator[] (const std::string&);
 
-    value*
-    operator[] (const std::string& name);
+    value_proxy
+    operator[] (const variable&);
 
   private:
     friend class scope_map;
 
     typedef path_map<scope>::const_iterator iterator;
 
-    scope () = default;
+    scope (): variables (*this) {}
 
     void
     init (const iterator& i, scope* p) {i_ = i; parent_ = p;}
-- 
cgit v1.1