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

Fixed std builds, removed non-standard conforming swap in directory_iterator/recursive_directory_iterator.

Browse Source
This commit is contained in:
Steffen Schuemann 2019-05-26 12:35:39 +02:00
parent 3ae76b29a0
commit f3ab2af99f
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/ghc/filesystem.hpp
View File

@ -681,7 +681,6 @@ public:
} }
bool operator==(const directory_iterator& rhs) const; bool operator==(const directory_iterator& rhs) const;
bool operator!=(const directory_iterator& rhs) const; bool operator!=(const directory_iterator& rhs) const;
void swap(directory_iterator& rhs);
private: private:
friend class recursive_directory_iterator; friend class recursive_directory_iterator;
@ -740,7 +739,6 @@ public:
} }
bool operator==(const recursive_directory_iterator& rhs) const; bool operator==(const recursive_directory_iterator& rhs) const;
bool operator!=(const recursive_directory_iterator& rhs) const; bool operator!=(const recursive_directory_iterator& rhs) const;
void swap(recursive_directory_iterator& rhs);
private: private:
struct recursive_directory_iterator_impl struct recursive_directory_iterator_impl
@ -4780,11 +4778,6 @@ GHC_INLINE bool directory_iterator::operator!=(const directory_iterator& rhs) co
return _impl->_current != rhs._impl->_current; return _impl->_current != rhs._impl->_current;
} }
GHC_INLINE void directory_iterator::swap(directory_iterator& rhs)
{
std::swap(_impl, rhs._impl);
}
// 30.10.13.2 directory_iterator non-member functions // 30.10.13.2 directory_iterator non-member functions
GHC_INLINE directory_iterator begin(directory_iterator iter) noexcept GHC_INLINE directory_iterator begin(directory_iterator iter) noexcept
@ -4950,11 +4943,6 @@ GHC_INLINE bool recursive_directory_iterator::operator!=(const recursive_directo
return _impl->_dir_iter_stack.top() != rhs._impl->_dir_iter_stack.top(); return _impl->_dir_iter_stack.top() != rhs._impl->_dir_iter_stack.top();
} }
GHC_INLINE void recursive_directory_iterator::swap(recursive_directory_iterator& rhs)
{
std::swap(_impl, rhs._impl);
}
// 30.10.14.2 directory_iterator non-member functions // 30.10.14.2 directory_iterator non-member functions
GHC_INLINE recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept GHC_INLINE recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept
{ {

3
test/filesystem_test.cpp
View File

@ -1267,9 +1267,6 @@ TEST_CASE("30.10.13 class directory_iterator", "[filesystem][directory_iterator]
CHECK(iter3->path().filename() == "test"); CHECK(iter3->path().filename() == "test");
iter4 = std::move(iter3); iter4 = std::move(iter3);
CHECK(iter4->path().filename() == "test"); CHECK(iter4->path().filename() == "test");
iter3 = fs::directory_iterator();
iter3.swap(iter4);
CHECK(iter3->path().filename() == "test");
CHECK(iter->path() == t.path() / "test"); CHECK(iter->path() == t.path() / "test");
CHECK(!iter->is_symlink()); CHECK(!iter->is_symlink());
CHECK(iter->is_regular_file()); CHECK(iter->is_regular_file());