From f8d45f488c0b0c02eed6a1acb0386964b95189f8 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 2 Oct 2021 21:18:19 +0100 Subject: [PATCH] libstdc++: Fix typos in std::filesystem code There were a couple of typos in r12-4070 and r12-4071 which don't show up when building for POSIX targets. libstdc++-v3/ChangeLog: * src/c++17/fs_ops.cc (create_directory): Fix typo in enum name. * src/filesystem/ops-common.h (__last_system_error): Add explicit cast to avoid narrowing conversion. (do_space): Fix type in function name. (cherry picked from commit b7848a2068b2579092e0b1bbe02bdb743eb7db26) --- libstdc++-v3/src/c++17/fs_ops.cc | 2 +- libstdc++-v3/src/filesystem/ops-common.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc index 5d070a4bc8f0..1fb295498c6a 100644 --- a/libstdc++-v3/src/c++17/fs_ops.cc +++ b/libstdc++-v3/src/c++17/fs_ops.cc @@ -639,7 +639,7 @@ fs::create_directory(const path& p, const path& attributes, } return create_dir(p, static_cast(st.st_mode), ec); #else - ec = std::make_error_code(std::errc::function_function_not_supported); + ec = std::make_error_code(std::errc::function_not_supported); return false; #endif } diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index 325b80830d58..087c3fb655e6 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -62,7 +62,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __last_system_error() noexcept { #ifdef _GLIBCXX_FILESYSTEM_IS_WINDOWS - return {::GetLastError(), std::system_category()}; + return {(int)::GetLastError(), std::system_category()}; #else return {errno, std::generic_category()}; #endif @@ -596,7 +596,7 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM ec.clear(); } else - ec = std::last_system_error(); + ec = std::__last_system_error(); #else ec = std::make_error_code(std::errc::function_not_supported); #endif -- 2.47.2