aboutsummaryrefslogtreecommitdiff
path: root/build2/context.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-02-07 15:48:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-02-07 16:52:55 +0200
commit968d8a7acd6c23078a3ea6936c03be0b45523227 (patch)
treed7da843d0961b649ff93f6f299b9ce65b1255003 /build2/context.hxx
parent378b2598a305d4e332e52460ca89dd867546a58b (diff)
Add support for update-for-{test,install} operation aliases
Diffstat (limited to 'build2/context.hxx')
-rw-r--r--build2/context.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/build2/context.hxx b/build2/context.hxx
index 97ba285..7702564 100644
--- a/build2/context.hxx
+++ b/build2/context.hxx
@@ -285,8 +285,8 @@ namespace build2
// lifted. The name is always for an outer operation (or meta operation
// that hasn't been recognized as such yet).
//
- extern const string* current_mname;
- extern const string* current_oname;
+ extern string current_mname;
+ extern string current_oname;
extern const meta_operation_info* current_mif;
extern const operation_info* current_inner_oif;
@@ -315,7 +315,7 @@ namespace build2
inline void
set_current_mif (const meta_operation_info& mif)
{
- current_mname = &mif.name;
+ current_mname = mif.name;
current_mif = &mif;
current_on = 0; // Reset.
}
@@ -324,7 +324,7 @@ namespace build2
set_current_oif (const operation_info& inner_oif,
const operation_info* outer_oif = nullptr)
{
- current_oname = &(outer_oif == nullptr ? inner_oif : *outer_oif).name;
+ current_oname = (outer_oif == nullptr ? inner_oif : *outer_oif).name;
current_inner_oif = &inner_oif;
current_outer_oif = outer_oif;
current_on++;