0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filesystem/Boost: range-for

Browse source
This commit is contained in:
Charles Dang 2018-05-11 11:44:16 +11:00
parent 32111ae5e9
commit c643b765dd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/filesystem_boost.cpp
View file

@ -815,20 +815,20 @@ bool delete_directory(const std::string& dirname, const bool keep_pbl)
get_files_in_dir(dirname, &files, &dirs, ENTIRE_FILE_PATH, keep_pbl ? SKIP_PBL_FILES : NO_FILTER);
if(!files.empty()) {
for(std::vector<std::string>::const_iterator i = files.begin(); i != files.end(); ++i) {
bfs::remove(path(*i), ec);
for(const std::string& f : files) {
bfs::remove(path(f), ec);
if(ec) {
LOG_FS << "remove(" << (*i) << "): " << ec.message() << '\n';
LOG_FS << "remove(" << f << "): " << ec.message() << '\n';
ret = false;
}
}
}
if(!dirs.empty()) {
for(std::vector<std::string>::const_iterator j = dirs.begin(); j != dirs.end(); ++j) {
for(const std::string& d : dirs) {
// TODO: this does not preserve any other PBL files
// filesystem.cpp does this too, so this might be intentional
if(!delete_directory(*j))
if(!delete_directory(d))
ret = false;
}
}
@ -1197,8 +1197,8 @@ void binary_paths_manager::cleanup()
{
binary_paths_cache.clear();
for(std::vector<std::string>::const_iterator i = paths_.begin(); i != paths_.end(); ++i) {
binary_paths.erase(*i);
for(const std::string& p : paths_) {
binary_paths.erase(p);
}
}