From ecb1524f8da7901338b263384fed3c612f117b4c Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:22:36 +0200 Subject: 5.11 --- RealtimeSync/watcher.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'RealtimeSync/watcher.cpp') 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& dirNamesNonFmt, //detect when volumes are removed/are not available anymore std::vector>> 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& 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& dirNamesNonFmt, WaitCal const std::vector& 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 -- cgit