microsoft
diff --git a/‎stl/inc/filesystem‎
Lines changed: 19 additions & 9 deletions b/‎stl/inc/filesystem‎
Lines changed: 19 additions & 9 deletions
diff --git a/‎tests/std/tests/P0218R1_filesystem/test.cpp‎
Lines changed: 9 additions & 0 deletions b/‎tests/std/tests/P0218R1_filesystem/test.cpp‎
Lines changed: 9 additions & 0 deletions
@@ -3585,23 +3585,33 @@ namespace filesystem {
     }
 
     // FUNCTION remove
-    inline bool remove(const path& _Target) {
+    inline bool remove(const path& _Target, error_code& _Ec) noexcept {
         // remove file _Target (even if it is a directory); returns whether the file was removed
         // note !exists(_Target) is not an error, and merely returns false
-        const auto _Result = __std_fs_remove(_Target.c_str());
-        if (_Result._Error != __std_win_error::_Success) {
-            _Throw_fs_error("remove", _Result._Error, _Target);
+        auto _Result = __std_fs_remove(_Target.c_str());
+        if (_Result._Error == __std_win_error::_Access_denied) {
+            // Try to remove the read-only attribute and try again
+            const auto _Perm_change_err = __std_fs_change_permissions(_Target.c_str(), false, false);
+            if (_Perm_change_err != __std_win_error::_Success) {
+                _Ec = _Make_ec(_Perm_change_err);
+                return false;
+            }
+            _Result = __std_fs_remove(_Target.c_str());
         }
-
+        _Ec = _Make_ec(_Result._Error);
         return _Result._Removed;
     }
 
-    inline bool remove(const path& _Target, error_code& _Ec) noexcept {
+    inline bool remove(const path& _Target) {
         // remove file _Target (even if it is a directory); returns whether the file was removed
         // note !exists(_Target) is not an error, and merely returns false
-        const auto _Result = __std_fs_remove(_Target.c_str());
-        _Ec                = _Make_ec(_Result._Error);
-        return _Result._Removed;
+        error_code _Ec;
+        const auto _Result = _STD filesystem::remove(_Target, _Ec);
+        if (static_cast<__std_win_error>(_Ec.value()) != __std_win_error::_Success) {
+            _Throw_fs_error("remove", static_cast<__std_win_error>(_Ec.value()), _Target);
+        }
+
+        return _Result;
     }
 
     // FUNCTION rename
 
@@ -3281,6 +3281,15 @@ void test_remove() {
     EXPECT(!exists(filename, ec));
     EXPECT(good(ec));
 
+    create_file_containing(filename, L"hello");
+    permissions(filename, perms::owner_write | perms::group_write | perms::others_write, perm_options::remove);
+
+    // remove a read-only file also
+    EXPECT(remove(filename, ec));
+    EXPECT(good(ec));
+    EXPECT(!exists(filename, ec));
+    EXPECT(good(ec));
+
     EXPECT(remove(dirname, ec));
     EXPECT(good(ec));
     EXPECT(!exists(dirname, ec));