From 968d8a7acd6c23078a3ea6936c03be0b45523227 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 7 Feb 2018 15:48:50 +0200
Subject: Add support for update-for-{test,install} operation aliases

---
 build2/context.hxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build2/context.hxx')

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++;
-- 
cgit v1.1