diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-06-03 12:59:26 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-06-03 13:00:04 +0300 |
| commit | d37709e5c27b1fe7b98de57247449c6272c79580 (patch) | |
| tree | 9d453f1f0fe949175b1d35eff7121a984656c14d /build2/cc/compile-rule.cxx | |
| parent | 13c05ef5a633d3779e4b1b01a0306755e27c2c4b (diff) | |
Adapt to renaming traits alias to traits_type for basic_path, basic_url, and string_table class templates
Diffstat (limited to 'build2/cc/compile-rule.cxx')
| -rw-r--r-- | build2/cc/compile-rule.cxx | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx index 94e50cd..170e358 100644 --- a/build2/cc/compile-rule.cxx +++ b/build2/cc/compile-rule.cxx @@ -1549,7 +1549,7 @@ namespace build2 if (p > 1 && p + 1 < l.size () && // 2 chars before, 1 after. l[p - 2] == ' ' && alpha (l[p - 1]) && - path::traits::is_separator (l[p + 1])) + path::traits_type::is_separator (l[p + 1])) p = l.rfind (':', p - 2); } @@ -2006,13 +2006,14 @@ namespace build2 // if (const strings* ih = import_hdr) { - auto i (lower_bound (ih->begin (), - ih->end (), - hp, - [] (const string& x, const string& y) - { - return path::traits::compare (x, y) < 0; - })); + auto i ( + lower_bound (ih->begin (), + ih->end (), + hp, + [] (const string& x, const string& y) + { + return path::traits_type::compare (x, y) < 0; + })); if (i != ih->end () && *i == hp) { @@ -2745,8 +2746,8 @@ namespace build2 // -I$src/out_*). We just need to add a trailing directory // separator if it's not already there. // - if (!dir_path::traits::is_separator (ds.back ())) - ds += dir_path::traits::directory_separator; + if (!dir_path::traits_type::is_separator (ds.back ())) + ds += dir_path::traits_type::directory_separator; dir_path d (move (ds), dir_path::exact); // Move the buffer in. @@ -4383,7 +4384,7 @@ namespace build2 // FOObar // bool fs (fc == '_' || fc == '-' || fc == '.' || - path::traits::is_separator (fc)); + path::traits_type::is_separator (fc)); bool ms (mc == '_' || mc == '.'); if (fs && ms) |