From d90ac405ae50f84a3cf4ba0b806cca1c89f81cff Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 26 Jul 2018 14:12:56 +0300
Subject: Make project variable to be of project_name type

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

(limited to 'build2/cc')

diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index 3c4994e..ca73483 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -444,6 +444,7 @@ namespace build2
         // search (name, scope).
         //
         dir_path out;
+
         prerequisite_key pk {n.proj, {tt, &n.dir, &out, &n.value, ext}, &s};
         xt = search_library_existing (a, sysd, usrd, pk);
 
diff --git a/build2/cc/common.hxx b/build2/cc/common.hxx
index 27706f3..18824cb 100644
--- a/build2/cc/common.hxx
+++ b/build2/cc/common.hxx
@@ -288,7 +288,7 @@ namespace build2
       bool
       pkgconfig_load (action, const scope&,
                       bin::lib&, bin::liba*, bin::libs*,
-                      const optional<string>&,
+                      const optional<project_name>&,
                       const string&,
                       const dir_path&,
                       const dir_paths&,
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index 5ace6ec..55c8b35 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -456,7 +456,7 @@ namespace build2
                     lib& lt,
                     liba* at,
                     libs* st,
-                    const optional<string>& proj,
+                    const optional<project_name>& proj,
                     const string& stem,
                     const dir_path& libd,
                     const dir_paths& top_sysd,
@@ -551,7 +551,7 @@ namespace build2
         if (proj)
         {
           f = dir;
-          f /= *proj;
+          f /= proj->string ();
           f += sfx;
           f += ".pc";
           if (exists (f))
@@ -1102,7 +1102,7 @@ namespace build2
                     lib&,
                     liba*,
                     libs*,
-                    const optional<string>&,
+                    const optional<project_name>&,
                     const string&,
                     const dir_path&,
                     const dir_paths&,
@@ -1142,7 +1142,7 @@ namespace build2
         ofdstream os (p);
 
         {
-          const string& n (cast<string> (rs.vars[var_project]));
+          const project_name& n (cast<project_name> (rs.vars[var_project]));
 
           lookup vl (rs.vars[var_version]);
           if (!vl)
-- 
cgit v1.1