Implement automatic amalgamation discovery

1 files changed, 2 insertions, 8 deletions

diff --git a/build/scope b/build/scope
index d1cd941..817ee95 100644
--- a/build/scope
+++ b/build/scope
@@ -70,16 +70,10 @@ namespace build
     // returned.
     //
     value_proxy
-    assign (const variable& var)
-    {
-      return vars.assign (var);
-    }
+    assign (const variable& var) {return vars.assign (var).first;}
 
     value_proxy
-    assign (const std::string& name)
-    {
-      return assign (variable_pool.find (name));
-    }
+    assign (const std::string& name) {return vars.assign (name).first;}
 
     // Return a value_proxy suitable for appending. If the variable
     // does not exist in this scope's map, then outer scopes are