Rename some variables to avoid conflicts with C++20 keywords

[builder.git] / source / lib / component.cpp

diff --git a/source/lib/component.cpp b/source/lib/component.cpp
index f6ef96cf824d4a13008d7f09f63248f6953753cc..61aa0db855867ed91863ec1e2d99b336c849f4a6 100644 (file)
--- a/source/lib/component.cpp
+++ b/source/lib/component.cpp
@@ -14,7 +14,7 @@ using namespace Msp;
 
 void Component::prepare()
 {
-       for(Package *r: requires)
+       for(Package *r: required_pkgs)
        {
                r->prepare();
                broken |= r->is_broken();
@@ -34,7 +34,7 @@ void Component::create_build_info()
        final_build_info.defines[build_macro] = "1";
 
        const Package::Requirements &pkg_reqs = package.get_required_packages();
-       Package::Requirements direct_reqs = requires;
+       Package::Requirements direct_reqs = required_pkgs;
        direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end());
        for(Package *r: direct_reqs)
                final_build_info.update_from(r->get_exported_build_info(), BuildInfo::DEPENDENCY);
@@ -181,7 +181,7 @@ void Component::Loader::require(const string &n)
 {
        Package *req = obj.package.get_builder().get_package_manager().find_package(n);
        if(req)
-               obj.requires.push_back(req);
+               obj.required_pkgs.push_back(req);
        else
                obj.problems.push_back(format("Required package %s not found", n));
 }