From f3ab2af99fda2dad26334d2a4884faa7463f7edb Mon Sep 17 00:00:00 2001 From: Steffen Schuemann Date: Sun, 26 May 2019 12:35:39 +0200 Subject: [PATCH] Fixed std builds, removed non-standard conforming swap in directory_iterator/recursive_directory_iterator. --- include/ghc/filesystem.hpp | 12 ------------ test/filesystem_test.cpp | 3 --- 2 files changed, 15 deletions(-) diff --git a/include/ghc/filesystem.hpp b/include/ghc/filesystem.hpp index c26c9a9..3020a3b 100644 --- a/include/ghc/filesystem.hpp +++ b/include/ghc/filesystem.hpp @@ -681,7 +681,6 @@ public: } bool operator==(const directory_iterator& rhs) const; bool operator!=(const directory_iterator& rhs) const; - void swap(directory_iterator& rhs); private: 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; - void swap(recursive_directory_iterator& rhs); private: 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; } -GHC_INLINE void directory_iterator::swap(directory_iterator& rhs) -{ - std::swap(_impl, rhs._impl); -} - // 30.10.13.2 directory_iterator non-member functions 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(); } -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 GHC_INLINE recursive_directory_iterator begin(recursive_directory_iterator iter) noexcept { diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp index c846b6c..faa66f7 100644 --- a/test/filesystem_test.cpp +++ b/test/filesystem_test.cpp @@ -1267,9 +1267,6 @@ TEST_CASE("30.10.13 class directory_iterator", "[filesystem][directory_iterator] CHECK(iter3->path().filename() == "test"); iter4 = std::move(iter3); 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->is_symlink()); CHECK(iter->is_regular_file());