aboutsummaryrefslogtreecommitdiff
path: root/build2/b.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-03-07 14:30:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-03-07 14:30:28 +0200
commit9400ddfc949025abddb04344624fba3945562d33 (patch)
treed67200faeaa9500f79117b46542b93ec745ef58d /build2/b.cxx
parent1845141809aa91b03718066a6f46863885a6a887 (diff)
Move bunch of root scope-only data members to root_extra
Diffstat (limited to 'build2/b.cxx')
-rw-r--r--build2/b.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index a7207b9..789bbc2 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -1076,7 +1076,7 @@ main (int argc, char* argv[])
if (first)
{
mid = m;
- mif = rs.meta_operations[m];
+ mif = rs.root_extra->meta_operations[m];
if (mif == nullptr)
fail (l) << "target " << tn << " does not support meta-"
@@ -1088,7 +1088,8 @@ main (int argc, char* argv[])
//
else
{
- const meta_operation_info* mi (rs.meta_operations[mid]);
+ const meta_operation_info* mi (
+ rs.root_extra->meta_operations[mid]);
if (mi == nullptr)
fail (l) << "target " << tn << " does not support meta-"
@@ -1132,7 +1133,7 @@ main (int argc, char* argv[])
auto lookup =
[&rs, &l, &tn] (operation_id o) -> const operation_info*
{
- const operation_info* r (rs.operations[o]);
+ const operation_info* r (rs.root_extra->operations[o]);
if (r == nullptr)
fail (l) << "target " << tn << " does not support "
@@ -1209,7 +1210,7 @@ main (int argc, char* argv[])
auto check =
[&rs, &l, &tn] (operation_id o, const operation_info* i)
{
- const operation_info* r (rs.operations[o]);
+ const operation_info* r (rs.root_extra->operations[o]);
if (r == nullptr)
fail (l) << "target " << tn << " does not support "