diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:36 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:36 +0200 |
commit | ecb1524f8da7901338b263384fed3c612f117b4c (patch) | |
tree | e7e06423fe27ea5ab45f27fc4b39ae597ba72490 /RealtimeSync/watcher.cpp | |
parent | 5.10 (diff) | |
download | FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.gz FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.bz2 FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.zip |
5.11
Diffstat (limited to 'RealtimeSync/watcher.cpp')
-rw-r--r-- | RealtimeSync/watcher.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/RealtimeSync/watcher.cpp b/RealtimeSync/watcher.cpp index 8ed37ea3..1380e474 100644 --- a/RealtimeSync/watcher.cpp +++ b/RealtimeSync/watcher.cpp @@ -65,9 +65,9 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNamesNonFmt, //detect when volumes are removed/are not available anymore std::vector<std::pair<Zstring, std::shared_ptr<DirWatcher>>> watches; - for (auto iter = dirNamesFmt.begin(); iter != dirNamesFmt.end(); ++iter) + for (auto it = dirNamesFmt.begin(); it != dirNamesFmt.end(); ++it) { - const Zstring& dirnameFmt = *iter; + const Zstring& dirnameFmt = *it; try { //a non-existent network path may block, so check existence asynchronously! @@ -107,10 +107,10 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNamesNonFmt, }(); - for (auto iter = watches.begin(); iter != watches.end(); ++iter) + for (auto it = watches.begin(); it != watches.end(); ++it) { - const Zstring& dirname = iter->first; - DirWatcher& watcher = *(iter->second); + const Zstring& dirname = it->first; + DirWatcher& watcher = *(it->second); //IMPORTANT CHECK: dirwatcher has problems detecting removal of top watched directories! if (checkDirExistNow) @@ -166,9 +166,9 @@ void rts::waitForMissingDirs(const std::vector<Zstring>& dirNamesNonFmt, WaitCal const std::vector<Zstring>& dirNamesFmt = getFormattedDirs(dirNamesNonFmt); //throw FileError bool allExisting = true; - for (auto iter = dirNamesFmt.begin(); iter != dirNamesFmt.end(); ++iter) + for (auto it = dirNamesFmt.begin(); it != dirNamesFmt.end(); ++it) { - const Zstring dirnameFmt = *iter; + const Zstring dirnameFmt = *it; auto ftDirExisting = async([=]() -> bool { #ifdef FFS_WIN |