Skip to content
Snippets Groups Projects
Commit 949bfe2a authored by december0123's avatar december0123
Browse files

Use stl instead of loops

parent 003a2ef1
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <dirent.h> #include <dirent.h>
#include <algorithm>
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
#include <sstream> #include <sstream>
...@@ -340,48 +341,41 @@ void Data::getAllDependenciesToInstall(Config *config, ...@@ -340,48 +341,41 @@ void Data::getAllDependenciesToInstall(Config *config,
for (auto configDependency = config->dependencies_.begin(); for (auto configDependency = config->dependencies_.begin();
configDependency != config->dependencies_.end(); configDependency++) configDependency != config->dependencies_.end(); configDependency++)
{ {
bool found = false; auto found = std::find_if(installedConfigs->begin(), installedConfigs->end(),
[configDependency](const Config* rhs)->bool
for (auto installedConfig = installedConfigs->begin(); {
installedConfig != installedConfigs->end(); installedConfig++) return (*configDependency == rhs->name_);
{ });
if ((*configDependency) == (*installedConfig)->name_)
{
found = true;
break;
}
}
if (found)
continue;
// Check if already in vector
for (auto dependency = dependencies->begin();
dependency != dependencies->end(); dependency++)
{
if ((*dependency)->name_ == (*configDependency))
{
found = true;
break;
}
}
if (found) if (found != installedConfigs->end())
{ {
continue; continue;
} }
else else
{ {
// Add to vector and check for further subdepends... found = std::find_if(dependencies->begin(), dependencies->end(),
Config *dependconfig = getDatabaseConfig((*configDependency), config->type_); [configDependency](const Config* rhs)->bool
if (dependconfig == nullptr) {
return (*configDependency == rhs->name_);
});
if (found != dependencies->end())
{ {
continue; continue;
} }
else else
{ {
dependencies->push_back(dependconfig); // Add to vector and check for further subdepends...
getAllDependenciesToInstall(dependconfig, installedConfigs, dependencies); Config *dependconfig = getDatabaseConfig((*configDependency), config->type_);
if (dependconfig == nullptr)
{
continue;
}
else
{
dependencies->push_back(dependconfig);
getAllDependenciesToInstall(dependconfig, installedConfigs, dependencies);
}
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment