aboutsummaryrefslogtreecommitdiff
path: root/build/cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-04-08 11:29:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-04-08 11:29:43 +0200
commit29c3e3b8912b784d9e2e4a4bec4c2378c7ffef7a (patch)
tree3465bcb6fd73dbedfcc42ecdd94e71e701a2a1e8 /build/cxx
parent9e6303e86dae25096ee62d74abfca4456be6a96f (diff)
Get rid of need to store scope in variable value
Diffstat (limited to 'build/cxx')
-rw-r--r--build/cxx/module.cxx10
1 files changed, 5 insertions, 5 deletions
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