diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-09-28 20:48:35 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-10-01 12:15:10 +0300 |
commit | 59db6ff22d090f8b47e278e9ecbeaa049ba3ba55 (patch) | |
tree | 5a0a1944e12e8a67d24e5a15390e1792d9122bff /libbuild2/parser.cxx | |
parent | 4c7a3c1350687d2913a2e008c2c41deceedcdead (diff) |
Adapt to swapping of entry and pattern parameters in butl::path_match()
Diffstat (limited to 'libbuild2/parser.cxx')
-rw-r--r-- | libbuild2/parser.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx index 0a5142f..33da1b5 100644 --- a/libbuild2/parser.cxx +++ b/libbuild2/parser.cxx @@ -3691,10 +3691,10 @@ namespace build2 // Compare name to pattern as paths and according to dir. // - auto match = [&dir, sp] (const path& pattern, const name& n) -> bool + auto match = [&dir, sp] (const name& n, const path& pattern) -> bool { const path& p (dir ? path_cast<path> (n.dir) : path (n.value)); - return path_match (pattern, p, *sp); + return path_match (p, pattern, *sp); }; // Append name/extension to result according to dir. Store an indication @@ -3810,7 +3810,7 @@ namespace build2 { for (auto i (r.begin ()); i != r.end (); ) { - if (match (p, *i)) + if (match (*i, p)) i = r.erase (i); else ++i; |