aboutsummaryrefslogtreecommitdiff
path: root/build2/dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-03-28 09:45:20 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-03-28 16:03:35 +0200
commit69801c4e23f877359118e55ed291737f4fbece04 (patch)
treecd4cb504a5c28aafde601e2d5d4603a44c75b548 /build2/dist
parent3ce44330cca9dbc4314feebb27403ebc3175b6c2 (diff)
Add variable cast from lookup
Diffstat (limited to 'build2/dist')
-rw-r--r--build2/dist/operation.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index 4489485..cb418be 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -90,7 +90,7 @@ namespace build2
fail << "unknown root distribution directory" <<
info << "did you forget to specify config.dist.root?";
- const dir_path& dist_root (cast<dir_path> (*l));
+ const dir_path& dist_root (cast<dir_path> (l));
if (!dir_exists (dist_root))
fail << "root distribution directory " << dist_root
@@ -102,8 +102,8 @@ namespace build2
fail << "unknown distribution package name" <<
info << "did you forget to set dist.package?";
- const string& dist_package (cast<string> (*l));
- const string& dist_cmd (cast<string> (*rs->vars["dist.cmd"]));
+ const string& dist_package (cast<string> (l));
+ const string& dist_cmd (cast<string> (rs->vars["dist.cmd"]));
// Get the list of operations supported by this project. Skip
// default_id.
@@ -171,7 +171,7 @@ namespace build2
//
if (auto l = rs->vars["subprojects"])
{
- for (auto p: cast<subprojects> (*l))
+ for (auto p: cast<subprojects> (l))
{
const dir_path& pd (p.second);
dir_path out_nroot (out_root / pd);
@@ -209,7 +209,7 @@ namespace build2
//
auto l ((*ft)[dist_var]);
- if (l && !cast<bool> (*l))
+ if (l && !cast<bool> (l))
l5 ([&]{trace << "excluding " << *ft;});
else
files.push_back (ft);
@@ -223,7 +223,7 @@ namespace build2
//
auto l ((*ft)[dist_var]);
- if (l && cast<bool> (*l))
+ if (l && cast<bool> (l))
{
l5 ([&]{trace << "including " << *ft;});
files.push_back (ft);
@@ -295,7 +295,7 @@ namespace build2
//
if (auto l = rs->vars["dist.archives"])
{
- for (const string& e: cast<strings> (*l))
+ for (const string& e: cast<strings> (l))
archive (dist_root, dist_package, e);
}
}