From 916769d98afdc7912aa90e2443fb2ac06d46d36e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 15 Aug 2019 13:42:55 +0200 Subject: Minor naming improvement --- build2/cc/link-rule.cxx | 10 +++++----- build2/cc/link-rule.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'build2') diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx index acc5b7e..e627aff 100644 --- a/build2/cc/link-rule.cxx +++ b/build2/cc/link-rule.cxx @@ -846,7 +846,7 @@ namespace build2 add_adhoc_member (t); } - md.libs_data = derive_libs_paths (t, p, s); + md.libs_paths = derive_libs_paths (t, p, s); } break; @@ -2098,7 +2098,7 @@ namespace build2 // if (lt.shared_library ()) { - const libs_paths& paths (md.libs_data); + const libs_paths& paths (md.libs_paths); const string& leaf (paths.effect_soname ().leaf ().string ()); if (tclass == "macos") @@ -2544,7 +2544,7 @@ namespace build2 // if (lt.shared_library ()) { - const libs_paths& paths (md.libs_data); + const libs_paths& paths (md.libs_paths); const path& p (paths.clean); if (!p.empty ()) @@ -2874,7 +2874,7 @@ namespace build2 } }; - const libs_paths& paths (md.libs_data); + const libs_paths& paths (md.libs_paths); const path& lk (paths.link); const path& ld (paths.load); @@ -2985,7 +2985,7 @@ namespace build2 // if (lt.shared_library ()) { - const libs_paths& lp (md.libs_data); + const libs_paths& lp (md.libs_paths); auto add = [&extras] (const path& p) { diff --git a/build2/cc/link-rule.hxx b/build2/cc/link-rule.hxx index 3c51121..c572ab3 100644 --- a/build2/cc/link-rule.hxx +++ b/build2/cc/link-rule.hxx @@ -117,7 +117,7 @@ namespace build2 bool binless; // Binary-less library. - libs_paths libs_data; + link_rule::libs_paths libs_paths; }; // Library handling. -- cgit v1.1