[#2] remove_all now counts directories too

gulrak · Sep 23, 2018 · 4fbc6e1 · 4fbc6e1
1 parent 217fb2b
commit 4fbc6e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/filesystem.h b/filesystem.h
@@ -3628,7 +3628,7 @@ inline uintmax_t remove_all(const path& p, std::error_code& ec) noexcept
     if (ec) {
         return static_cast<uintmax_t>(-1);
     }
-    return count;
+    return ++count;
 }
 
 inline void rename(const path& from, const path& to)

diff --git a/test/filesystem_test.cpp b/test/filesystem_test.cpp
@@ -1983,7 +1983,7 @@ TEST_CASE("30.10.15.31 remove_all", "[filesystem][operations][fs.op.remove_all]"
     fs::create_directories("dir1/dir1b");
     generateFile("dir1/dir1a/f1");
     generateFile("dir1/dir1b/f2");
-    CHECK(fs::remove_all("dir1") == 2);
+    CHECK(fs::remove_all("dir1") == 5);
     CHECK(fs::directory_iterator(t.path()) == fs::directory_iterator());
 }