diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-09-18 15:57:52 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-09-18 15:57:52 +0200 |
| commit | 8c30c59de2d304a416dfd4fcb821e0b227e5db96 (patch) | |
| tree | f249eabbe955b38c5516e68f7577bbb4b5dbc705 /libbuild2/cc/compile-rule.cxx | |
| parent | 04bfd3bf7a71197bdf5f697e323c70e98b857571 (diff) | |
Rename importable_headers variable to translatable_headers
This name aligns better with the post-Cologne importable/translatable
semantics.
Diffstat (limited to 'libbuild2/cc/compile-rule.cxx')
| -rw-r--r-- | libbuild2/cc/compile-rule.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx index 450fbe9..d6adfd3 100644 --- a/libbuild2/cc/compile-rule.cxx +++ b/libbuild2/cc/compile-rule.cxx @@ -876,8 +876,8 @@ namespace build2 if (ut == unit_type::module_iface) cs.append (&md.symexport, sizeof (md.symexport)); - if (import_hdr != nullptr) - hash_options (cs, *import_hdr); + if (xlate_hdr != nullptr) + hash_options (cs, *xlate_hdr); if (md.pp != preprocessed::all) { @@ -2027,19 +2027,17 @@ namespace build2 // Reduce include translation to the import case. // - if (!imp && import_hdr != nullptr) + if (!imp && xlate_hdr != nullptr) { - const strings& ih (*import_hdr); - - auto i (lower_bound (ih.begin (), - ih.end (), - hp, - [] (const string& x, const string& y) - { - return path::traits_type::compare (x, y) < 0; - })); + auto i (lower_bound ( + xlate_hdr->begin (), xlate_hdr->end (), + hp, + [] (const string& x, const string& y) + { + return path::traits_type::compare (x, y) < 0; + })); - imp = (i != ih.end () && *i == hp); + imp = (i != xlate_hdr->end () && *i == hp); } if (imp) |