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/prerequisite.hxx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'build2/prerequisite.hxx')

diff --git a/build2/prerequisite.hxx b/build2/prerequisite.hxx
index b8707ce..3d8121a 100644
--- a/build2/prerequisite.hxx
+++ b/build2/prerequisite.hxx
@@ -31,12 +31,10 @@ namespace build2
   public:
     typedef build2::scope scope_type;
 
-    const optional<string>& proj;
+    const optional<project_name>& proj;
     target_key tk;                // The .dir and .out members can be relative.
     const scope_type* scope;      // Can be NULL if tk.dir is absolute.
 
-    static const optional<string> nullproj;
-
     template <typename T>
     bool is_a () const {return tk.is_a<T> ();}
     bool is_a (const target_type& tt) const {return tk.is_a (tt);}
@@ -65,7 +63,7 @@ namespace build2
     // bar/ here is relative to the scope, not to foo/. Plus, bar/ can resolve
     // to either src or out.
     //
-    const optional<string>  proj;
+    const optional<project_name> proj;
     const target_type_type& type;
     const dir_path dir;         // Normalized absolute or relative (to scope).
     const dir_path out;         // Empty, normalized absolute, or relative.
@@ -102,7 +100,7 @@ namespace build2
     append (const variable&, const target_type&);
 
   public:
-    prerequisite (optional<string> p,
+    prerequisite (optional<project_name> p,
                   const target_type_type& t,
                   dir_path d,
                   dir_path o,
-- 
cgit v1.1