aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/variable.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-08-22 16:08:45 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-08-22 16:16:32 +0200
commit708b092956f10b5c05641f90d55b209e887d52de (patch)
tree418b2ba2b214fc6af857d75301e5301d4fe0322b /libbuild2/variable.hxx
parent4f5b6cb7ed4e05e98cce7e692462f49e24b7a39a (diff)
Run phase
Diffstat (limited to 'libbuild2/variable.hxx')
-rw-r--r--libbuild2/variable.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/variable.hxx b/libbuild2/variable.hxx
index d153cb0..4befa51 100644
--- a/libbuild2/variable.hxx
+++ b/libbuild2/variable.hxx
@@ -1162,14 +1162,14 @@ namespace build2
void
clear () {map_.clear ();}
- variable_pool (): variable_pool (false) {}
+ variable_pool (): variable_pool (nullptr) {}
- // RW access.
+ // RW access (only for the global pool).
//
variable_pool&
rw () const
{
- assert (phase == run_phase::load);
+ assert (global_->phase == run_phase::load);
return const_cast<variable_pool&> (*this);
}
@@ -1251,15 +1251,15 @@ namespace build2
private:
std::multiset<pattern> patterns_;
- // Global pool flag.
+ // Global pool flag/context.
//
private:
friend class context;
explicit
- variable_pool (bool global): global_ (global) {}
+ variable_pool (context* global): global_ (global) {}
- bool global_;
+ context* global_;
};
}