From 4c44c914d898af53152addad5530504548175e85 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 20 Apr 2015 15:34:16 +0200
Subject: Merge config.cxx.* variables into cxx.* when loading cxx module

---
 build/variable | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'build/variable')

diff --git a/build/variable b/build/variable
index 48fc519..05ca671 100644
--- a/build/variable
+++ b/build/variable
@@ -106,7 +106,7 @@ namespace build
     T
     as () const = delete;
 
-    // Set interface.
+    // Assign.
     //
     const value_proxy&
     operator= (value_ptr) const;
@@ -117,16 +117,22 @@ namespace build
     const value_proxy&
     operator= (std::string) const;
 
-    // Append enother simple name to list_value.
+    const value_proxy&
+    operator= (dir_path) const;
+
+    const value_proxy&
+    operator= (nullptr_t) const;
+
+    // Append.
     //
     const value_proxy&
-    operator+= (std::string) const;
+    operator+= (const value_proxy&) const;
 
     const value_proxy&
-    operator= (dir_path) const;
+    operator+= (const list_value&) const;
 
     const value_proxy&
-    operator= (nullptr_t) const;
+    operator+= (std::string) const; // Append simple name to list_value.
 
     // Return true if this value belongs to the specified scope or target.
     //
-- 
cgit v1.1