diff options
Diffstat (limited to 'algorithm.cpp')
| -rw-r--r-- | algorithm.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/algorithm.cpp b/algorithm.cpp index b7adc039..46239369 100644 --- a/algorithm.cpp +++ b/algorithm.cpp @@ -168,13 +168,13 @@ struct AllEqual //test if non-equal items exist in scanned data bool operator()(const HierarchyObject& hierObj) const { return std::all_of(hierObj.refSubFiles().begin(), hierObj.refSubFiles().end(), - [](const FileMapping& fileObj) { return fileObj.getCategory() == FILE_EQUAL; }) && //files + [](const FileMapping& fileObj) { return fileObj.getCategory() == FILE_EQUAL; })&& //files - std::all_of(hierObj.refSubLinks().begin(), hierObj.refSubLinks().end(), - [](const SymLinkMapping& linkObj) { return linkObj.getLinkCategory() == SYMLINK_EQUAL; }) && //symlinks + std::all_of(hierObj.refSubLinks().begin(), hierObj.refSubLinks().end(), + [](const SymLinkMapping& linkObj) { return linkObj.getLinkCategory() == SYMLINK_EQUAL; })&& //symlinks - std::all_of(hierObj.refSubDirs(). begin(), hierObj.refSubDirs(). end(), - [](const DirMapping& dirObj) + std::all_of(hierObj.refSubDirs(). begin(), hierObj.refSubDirs(). end(), + [](const DirMapping& dirObj) { return dirObj.getDirCategory() == DIR_EQUAL && AllEqual()(dirObj); //short circuit-behavior! }); //directories @@ -1036,7 +1036,6 @@ void zen::applyFiltering(FolderComparison& folderCmp, const MainConfiguration& m mainCfg.additionalPairs.begin(), //add additional pairs mainCfg.additionalPairs.end()); - for (auto it = allPairs.begin(); it != allPairs.end(); ++it) { BaseDirMapping& baseDirectory = *folderCmp[it - allPairs.begin()]; |