summaryrefslogtreecommitdiff
path: root/algorithm.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:09 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:09 +0200
commit110fc5dee14fc7988f631a158e50d283446aba7a (patch)
tree7c19dfd3bdb8c4636409ec80a38c70499ac006db /algorithm.cpp
parent5.14 (diff)
downloadFreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.tar.gz
FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.tar.bz2
FreeFileSync-110fc5dee14fc7988f631a158e50d283446aba7a.zip
5.15
Diffstat (limited to 'algorithm.cpp')
-rw-r--r--algorithm.cpp11
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()];
bgstack15