aboutsummaryrefslogtreecommitdiff
path: root/build2/cc/compile-rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-05-03 13:23:33 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-05-03 13:23:33 +0200
commit8618078b90189fb49e9c0a76ac01d471b51f1e93 (patch)
tree63ee0435f3311d90d5863ca49a3dc0e5807bb097 /build2/cc/compile-rule.cxx
parent43c53a8b475f901a902ba1bf6ec603e7a28311b1 (diff)
Rename [config.]cxx.header_units to importable_headers
Diffstat (limited to 'build2/cc/compile-rule.cxx')
-rw-r--r--build2/cc/compile-rule.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index 07677a9..dd38945 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -877,8 +877,8 @@ namespace build2
if (ut == unit_type::module_iface)
cs.append (&md.symexport, sizeof (md.symexport));
- if (hdr_units != nullptr)
- hash_options (cs, *hdr_units);
+ if (import_hdr != nullptr)
+ hash_options (cs, *import_hdr);
if (md.pp != preprocessed::all)
{
@@ -2003,11 +2003,11 @@ namespace build2
{
// See if we need to translate this include to import.
//
- if (hdr_units != nullptr)
+ if (const strings* ih = import_hdr)
{
- auto i (lower_bound (hdr_units->begin (), hdr_units->end (), hp));
+ auto i (lower_bound (ih->begin (), ih->end (), hp));
- if (i != hdr_units->end () && *i == hp)
+ if (i != ih->end () && *i == hp)
{
// Doesn't seem there is much use in trying to correlate the
// followup in this case; what else can the compiler import?