aboutsummaryrefslogtreecommitdiff
path: root/build2/scope.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-04-18 10:17:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-04-18 10:17:37 +0200
commitae20570f2ad55b2fa8e71cf450457cb9c4b21b1b (patch)
tree4db6740878ffb28fb00c5fc323a1891300db749e /build2/scope.cxx
parente2501db05c9e9f139d22f3748584992679954721 (diff)
Add support for using value attributes in eval context
For example: if ($x == [null]) Or: if ([uint64] 01 == [uint64] 1)
Diffstat (limited to 'build2/scope.cxx')
-rw-r--r--build2/scope.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/build2/scope.cxx b/build2/scope.cxx
index b22cb0c..1459687 100644
--- a/build2/scope.cxx
+++ b/build2/scope.cxx
@@ -326,7 +326,7 @@ namespace build2
// while we still need to apply prefixes/suffixes in the type-aware way.
//
if (cache.value.type == nullptr && var.type != nullptr)
- typify (cache.value, *var.type, var);
+ typify (cache.value, *var.type, &var);
// Now apply override prefixes and suffixes. Also calculate the vars and
// depth of the result, which will be those of the stem or prefix/suffix
@@ -362,11 +362,11 @@ namespace build2
if (l) // No sense to prepend/append if NULL.
{
- cache.value.prepend (names (cast<names> (l)), var);
+ cache.value.prepend (names (cast<names> (l)), &var);
}
else if ((l = find (o, ".__suffix")))
{
- cache.value.append (names (cast<names> (l)), var);
+ cache.value.append (names (cast<names> (l)), &var);
}
if (l.defined ())