diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:16 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:16 +0200 |
| commit | 6d15812d7d93370d47e63f6bf9f70be40f5a9c5d (patch) | |
| tree | 8e7bde205084ca23e1766d42305824c927c2ee5f /algorithm.cpp | |
| parent | 5.6 (diff) | |
| download | FreeFileSync-6d15812d7d93370d47e63f6bf9f70be40f5a9c5d.tar.gz FreeFileSync-6d15812d7d93370d47e63f6bf9f70be40f5a9c5d.tar.bz2 FreeFileSync-6d15812d7d93370d47e63f6bf9f70be40f5a9c5d.zip | |
5.7
Diffstat (limited to 'algorithm.cpp')
| -rw-r--r-- | algorithm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/algorithm.cpp b/algorithm.cpp index 6ca1f73a..f1ff5f2a 100644 --- a/algorithm.cpp +++ b/algorithm.cpp @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) ZenJu (zhnmju123 AT gmx DOT de) - All Rights Reserved * +// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "algorithm.h" @@ -509,8 +509,8 @@ private: std::for_each(container.files.begin(), container.files.end(), [&](const std::pair<Zstring, InSyncFile>& filePair) { - if (filePair.second.left .id != FileId() && - filePair.second.right.id != FileId() && + if (getFileId(filePair.second.left ) != FileId() && + getFileId(filePair.second.right) != FileId() && stillInSync(filePair.second, cmpVar, fileTimeTolerance)) onceEqual.insert(std::make_pair(getFileIdKey(filePair.second.left), getFileIdKey(filePair.second.right))); }); @@ -572,7 +572,7 @@ private: //detection of renamed files template <SelectedSide side> static FileIdKey getFileIdKey(const FileMapping& fsObj) { return std::make_tuple(fsObj.getLastWriteTime<side>(), fsObj.getFileSize<side>(), fsObj.getFileId<side>()); } - static FileIdKey getFileIdKey(const FileDescriptor& fileDescr) { return std::make_tuple(fileDescr.lastWriteTimeRaw, fileDescr.fileSize, fileDescr.id); } + static FileIdKey getFileIdKey(const FileDescriptor& fileDescr) { return std::make_tuple(fileDescr.lastWriteTimeRaw, fileDescr.fileSize, getFileId(fileDescr)); } struct LessFileIdKey { |