GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #104, fixed noexcept inconsistency

Browse Source
This commit is contained in:
Steffen Schuemann 2021-02-22 23:31:56 +01:00
parent 8a19af1f63
commit 5c02ca36b4
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/ghc/filesystem.hpp
View File

@ -5730,22 +5730,26 @@ GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::operator+
GHC_INLINE recursive_directory_iterator& recursive_directory_iterator::increment(std::error_code& ec) noexcept
{
if (recursion_pending() && (*this)->is_directory() && (!(*this)->is_symlink() || (options() & directory_options::follow_directory_symlink) != directory_options::none)) {
_impl->_dir_iter_stack.push(directory_iterator((*this)->path(), _impl->_options, ec));
}
else {
_impl->_dir_iter_stack.top().increment(ec);
}
if (!ec) {
while (depth() && _impl->_dir_iter_stack.top() == directory_iterator()) {
_impl->_dir_iter_stack.pop();
bool isDir = (*this)->is_directory(ec);
bool isSymLink = !ec && (*this)->is_symlink(ec);
if(!ec) {
if (recursion_pending() && (*this)->is_directory() && (!(*this)->is_symlink() || (options() & directory_options::follow_directory_symlink) != directory_options::none)) {
_impl->_dir_iter_stack.push(directory_iterator((*this)->path(), _impl->_options, ec));
}
else {
_impl->_dir_iter_stack.top().increment(ec);
}
if (!ec) {
while (depth() && _impl->_dir_iter_stack.top() == directory_iterator()) {
_impl->_dir_iter_stack.pop();
_impl->_dir_iter_stack.top().increment(ec);
}
}
else if (!_impl->_dir_iter_stack.empty()) {
_impl->_dir_iter_stack.pop();
}
_impl->_recursion_pending = true;
}
else if (!_impl->_dir_iter_stack.empty()) {
_impl->_dir_iter_stack.pop();
}
_impl->_recursion_pending = true;
return *this;
}