diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-03-10 20:20:12 +0300 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-03-13 13:18:21 +0200 |
commit | 482d362979baf8b0fef7f46b0cd61a29faeb11a8 (patch) | |
tree | 0264746045798679cfee2e748d00bdd7ca050cb0 /build2/parser.cxx | |
parent | 6dbf4954a67efa284ae9abceb3b02c8642b79a49 (diff) |
Adapt for path_search() change
Diffstat (limited to 'build2/parser.cxx')
-rw-r--r-- | build2/parser.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build2/parser.cxx b/build2/parser.cxx index 7a84bae..50fcc06 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -2425,17 +2425,19 @@ namespace build2 //@@ PAT TODO: weed out starting with dot (unless pattern starts // with dot; last component? intermediate components?). // - function<bool (path&&)> func; + function<bool (path&&, const string&, bool)> func; if (unique) - func = [a, &append] (path&& m) + func = [a, &append] (path&& m, const string&, bool interm) { - append (move (m).representation (), a); + if (!interm) + append (move (m).representation (), a); return true; }; else - func = [a, &include_match] (path&& m) + func = [a, &include_match] (path&& m, const string&, bool interm) { - include_match (move (m).representation (), a); + if (!interm) + include_match (move (m).representation (), a); return true; }; |