From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 426C73850418; Mon, 29 Mar 2021 20:02:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 426C73850418 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-9581] libstdc++: Use correct error category for Windows error codes X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 0a0fd67cd1eabfb4ccd96de180f0298742b30670 X-Git-Newrev: d11150e7a499e011fe583336f88a857af0a8a32d Message-Id: <20210329200219.426C73850418@sourceware.org> Date: Mon, 29 Mar 2021 20:02:19 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 20:02:19 -0000 https://gcc.gnu.org/g:d11150e7a499e011fe583336f88a857af0a8a32d commit r10-9581-gd11150e7a499e011fe583336f88a857af0a8a32d Author: Jonathan Wakely Date: Wed Feb 10 16:45:38 2021 +0000 libstdc++: Use correct error category for Windows error codes When the result of GetLastError() is stored in a std::error_code it should use std::system_category(), not std::generic_category() that is used for POSIX errno values. libstdc++-v3/ChangeLog: * src/c++17/fs_ops.cc (fs::create_hard_link, fs::equivalent) (fs::remove): Use std::system_category() for error codes from GetLastError(). * src/filesystem/ops.cc (fs::create_hard_link, fs::remove): Likewise. (cherry picked from commit 313e2dc377d07d5fae5a3fd666ad7000d7e8771d) Diff: --- libstdc++-v3/src/c++17/fs_ops.cc | 8 ++++---- libstdc++-v3/src/filesystem/ops.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index 2cb26e4605b..b4c81763020 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -690,7 +690,7 @@ fs::create_hard_link(const path& to, const path& new_hard_link, if (CreateHardLinkW(new_hard_link.c_str(), to.c_str(), NULL)) ec.clear(); else - ec.assign((int)GetLastError(), generic_category()); + ec.assign((int)GetLastError(), system_category()); #else ec = std::make_error_code(std::errc::not_supported); #endif @@ -882,12 +882,12 @@ fs::equivalent(const path& p1, const path& p2, error_code& ec) noexcept if (!h1 || !h2) { if (!h1 && !h2) - ec.assign((int)GetLastError(), generic_category()); + ec.assign((int)GetLastError(), system_category()); return false; } if (!h1.get_info() || !h2.get_info()) { - ec.assign((int)GetLastError(), generic_category()); + ec.assign((int)GetLastError(), system_category()); return false; } return h1.info.dwVolumeSerialNumber == h2.info.dwVolumeSerialNumber @@ -1263,7 +1263,7 @@ fs::remove(const path& p, error_code& ec) noexcept return true; } else if (!ec) - ec.assign((int)GetLastError(), generic_category()); + ec.assign((int)GetLastError(), system_category()); } else if (status_known(st)) ec.clear(); diff --git a/libstdc++-v3/src/filesystem/ops.cc b/libstdc++-v3/src/filesystem/ops.cc index a1138490b3e..7cc82a50e01 100644 --- a/libstdc++-v3/src/filesystem/ops.cc +++ b/libstdc++-v3/src/filesystem/ops.cc @@ -590,7 +590,7 @@ fs::create_hard_link(const path& to, const path& new_hard_link, if (CreateHardLinkW(new_hard_link.c_str(), to.c_str(), NULL)) ec.clear(); else - ec.assign((int)GetLastError(), generic_category()); + ec.assign((int)GetLastError(), system_category()); #else ec = std::make_error_code(std::errc::not_supported); #endif @@ -1062,7 +1062,7 @@ fs::remove(const path& p, error_code& ec) noexcept return true; } else if (!ec) - ec.assign((int)GetLastError(), generic_category()); + ec.assign((int)GetLastError(), system_category()); } else if (status_known(st)) ec.clear();