diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-16 10:53:39 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-18 17:30:47 +0200 |
| commit | aeeedd32f8717d8c6a1886a5561a879059be87d0 (patch) | |
| tree | cdd4c893e05a1e950f689443ac63f532df721352 /build2/cc | |
| parent | a7efabf301f23364ac2335c80c5e1e712bc43204 (diff) | |
Make names and vector<name> different types, add typed value constructor
Diffstat (limited to 'build2/cc')
| -rw-r--r-- | build2/cc/common.cxx | 2 | ||||
| -rw-r--r-- | build2/cc/init.cxx | 8 | ||||
| -rw-r--r-- | build2/cc/pkgconfig.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
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 |