diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-07-26 14:12:56 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-07-30 13:04:37 +0300 |
| commit | d90ac405ae50f84a3cf4ba0b806cca1c89f81cff (patch) | |
| tree | 3f66be39a80a0a32cbba332e34b418fa1fc9ad02 /build2/prerequisite.hxx | |
| parent | e92a1aab0e1c7c9ba8e6ab9a7049207468ca53fc (diff) | |
Make project variable to be of project_name type
Diffstat (limited to 'build2/prerequisite.hxx')
| -rw-r--r-- | build2/prerequisite.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
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, |