From 29c3e3b8912b784d9e2e4a4bec4c2378c7ffef7a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 8 Apr 2015 11:29:43 +0200
Subject: Get rid of need to store scope in variable value

---
 build/cxx/module.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'build/cxx/module.cxx')

diff --git a/build/cxx/module.cxx b/build/cxx/module.cxx
index 04b1ae5..435e54c 100644
--- a/build/cxx/module.cxx
+++ b/build/cxx/module.cxx
@@ -49,7 +49,7 @@ namespace build
 
         if (val)
         {
-          if (&val.scope () != global_scope)
+          if (val.scope != global_scope)
             break; // A value from config.build.
 
           v = val.as<const string&> ();
@@ -110,7 +110,7 @@ namespace build
       //
       if (auto val = root["config.cxx.poptions"])
       {
-        if (&val.scope () == global_scope)
+        if (val.scope == global_scope)
           root.variables["config.cxx.poptions"] = val;
       }
       else
@@ -118,7 +118,7 @@ namespace build
 
       if (auto val = root["config.cxx.coptions"])
       {
-        if (&val.scope () == global_scope)
+        if (val.scope == global_scope)
           root.variables["config.cxx.coptions"] = val;
       }
       else
@@ -126,7 +126,7 @@ namespace build
 
       if (auto val = root["config.cxx.loptions"])
       {
-        if (&val.scope () == global_scope)
+        if (val.scope == global_scope)
           root.variables["config.cxx.loptions"] = val;
       }
       else
@@ -134,7 +134,7 @@ namespace build
 
       if (auto val = root["config.cxx.libs"])
       {
-        if (&val.scope () == global_scope)
+        if (val.scope == global_scope)
           root.variables["config.cxx.libs"] = val;
       }
       else
-- 
cgit v1.1