From aeeedd32f8717d8c6a1886a5561a879059be87d0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 16 Nov 2016 10:53:39 +0200
Subject: Make names and vector<name> different types, add typed value
 constructor

---
 build2/cc/common.cxx    | 2 +-
 build2/cc/init.cxx      | 8 ++++----
 build2/cc/pkgconfig.cxx | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'build2/cc')

diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index 911fbfa..14201d4 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -264,7 +264,7 @@ namespace build2
                        &find_sysd, &find_lo, &sys, &sys_simple,
                        &bs, &lo, this] (const lookup& lu)
       {
-        const names* ns (cast_null<names> (lu));
+        const vector<name>* ns (cast_null<vector<name>> (lu));
         if (ns == nullptr || ns->empty ())
           return;
 
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index b9dc4c1..036d622 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -49,10 +49,10 @@ namespace build2
       v.insert<strings> ("cc.loptions");
       v.insert<strings> ("cc.libs");
 
-      v.insert<strings> ("cc.export.poptions");
-      v.insert<strings> ("cc.export.coptions");
-      v.insert<strings> ("cc.export.loptions");
-      v.insert<names>   ("cc.export.libs");
+      v.insert<strings>      ("cc.export.poptions");
+      v.insert<strings>      ("cc.export.coptions");
+      v.insert<strings>      ("cc.export.loptions");
+      v.insert<vector<name>> ("cc.export.libs");
 
       // Hint variables (not overridable).
       //
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index 3a7bf82..580812c 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -260,7 +260,7 @@ namespace build2
         const string& lstr, target& t)
       {
         strings lops;
-        names libs;
+        vector<name> libs;
 
         // Normally we will have zero or more -L's followed by one or more
         // -l's, with the first one being the library itself. But sometimes
-- 
cgit v1.1