Rename local variables requires to dep_requires, C++20 compatibility

`requires` is a keyword in C++20.
rpm-software-management · Aug 17, 2023 · e236212 · e236212
1 parent 5b1d034
commit e236212
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/libdnf/goal/Goal.cpp b/libdnf/goal/Goal.cpp
@@ -531,11 +531,11 @@ static bool
 */
 can_depend_on(Pool *pool, Solvable *sa, Id b)
 {
-    IdQueue requires;
+    IdQueue dep_requires;
 
-    solvable_lookup_idarray(sa, SOLVABLE_REQUIRES, requires.getQueue());
-    for (int i = 0; i < requires.size(); ++i) {
-        Id req_dep = requires[i];
+    solvable_lookup_idarray(sa, SOLVABLE_REQUIRES, dep_requires.getQueue());
+    for (int i = 0; i < dep_requires.size(); ++i) {
+        Id req_dep = dep_requires[i];
         Id p, pp;
 
         FOR_PROVIDES(p, pp, req_dep)

diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
@@ -163,8 +163,8 @@ void ModulePackage::createDependencies(Solvable *solvable) const
     Pool * pool = dnf_sack_get_pool(moduleSack);
 
     for (const auto &dependency : getModuleDependencies()) {
-        for (const auto &requires : dependency.getRequires()) {
-            for (const auto &singleRequires : requires) {
+        for (const auto &dep_requires : dependency.getRequires()) {
+            for (const auto &singleRequires : dep_requires) {
                 auto moduleName = singleRequires.first;
                 std::vector<std::string> requiresStream;
                 for (const auto &moduleStream : singleRequires.second) {

diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
@@ -817,11 +817,11 @@ void ModulePackageContainer::enableDependencyTree(std::vector<ModulePackage *> &
         Query query(pImpl->moduleSack);
         query.addFilter(HY_PKG, HY_EQ, pImpl->activatedModules.get());
         auto pkg = dnf_package_new(pImpl->moduleSack, modulePackage->getId());
-        auto requires = dnf_package_get_requires(pkg);
-        query.addFilter(HY_PKG_PROVIDES, requires);
+        auto dep_requires = dnf_package_get_requires(pkg);
+        query.addFilter(HY_PKG_PROVIDES, dep_requires);
         auto set = query.runSet();
         toEnable += *set;
-        delete requires;
+        delete dep_requires;
         g_object_unref(pkg);
         enable(modulePackage);
         enabled.set(modulePackage->getId());
@@ -836,11 +836,11 @@ void ModulePackageContainer::enableDependencyTree(std::vector<ModulePackage *> &
             query.addFilter(HY_PKG, HY_EQ, pImpl->activatedModules.get());
             query.addFilter(HY_PKG, HY_NEQ, &enabled);
             auto pkg = dnf_package_new(pImpl->moduleSack, moduleId);
-            auto requires = dnf_package_get_requires(pkg);
-            query.addFilter(HY_PKG_PROVIDES, requires);
+            auto dep_requires = dnf_package_get_requires(pkg);
+            query.addFilter(HY_PKG_PROVIDES, dep_requires);
             auto set = query.runSet();
             toEnable += *set;
-            delete requires;
+            delete dep_requires;
             g_object_unref(pkg);
         }
         toEnable -= enabled;
@@ -1747,8 +1747,8 @@ void ModulePackageContainer::Impl::addVersion2Modules()
     std::map<std::string, std::map<std::string, std::vector<ModulePackage *>>> v3_context_map;
     for (auto const & module_pair : modules) {
         auto * module = module_pair.second.get();
-        auto requires = module->getRequires(true);
-        auto concentratedRequires = concentrateVectorString(requires);
+        auto dep_requires = module->getRequires(true);
+        auto concentratedRequires = concentrateVectorString(dep_requires);
         v3_context_map[module->getNameStream()][concentratedRequires].push_back(module);
     }
     libdnf::LibsolvRepo * repo;
@@ -1758,8 +1758,8 @@ void ModulePackageContainer::Impl::addVersion2Modules()
     for (auto & module_tuple : modulesV2) {
         std::tie(repo, mdStream, repoID) = module_tuple;
         auto nameStream = ModulePackage::getNameStream(mdStream);
-        auto requires = ModulePackage::getRequires(mdStream, true);
-        auto concentratedRequires = concentrateVectorString(requires);
+        auto dep_requires = ModulePackage::getRequires(mdStream, true);
+        auto concentratedRequires = concentrateVectorString(dep_requires);
         auto streamIterator = v3_context_map.find(nameStream);
         if (streamIterator != v3_context_map.end()) {
             auto contextIterator = streamIterator->second.find(concentratedRequires);