aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-10-02 21:18:19 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-10-02 21:20:05 +0100
commitb7848a2068b2579092e0b1bbe02bdb743eb7db26 (patch)
treea305c3735b72a19fef11a014c3357c17c3bf7025
parent6c0dd02964a624c65859808f9a40721c3796319a (diff)
downloadgcc-b7848a2068b2579092e0b1bbe02bdb743eb7db26.zip
gcc-b7848a2068b2579092e0b1bbe02bdb743eb7db26.tar.gz
gcc-b7848a2068b2579092e0b1bbe02bdb743eb7db26.tar.bz2
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.
-rw-r--r--libstdc++-v3/src/c++17/fs_ops.cc2
-rw-r--r--libstdc++-v3/src/filesystem/ops-common.h4
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 cb2dc2c..5b7f7ed 100644
--- a/libstdc++-v3/src/c++17/fs_ops.cc
+++ b/libstdc++-v3/src/c++17/fs_ops.cc
@@ -631,7 +631,7 @@ fs::create_directory(const path& p, const path& attributes,
}
return create_dir(p, static_cast<perms>(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 90ebeba..b314763 100644
--- a/libstdc++-v3/src/filesystem/ops-common.h
+++ b/libstdc++-v3/src/filesystem/ops-common.h
@@ -63,7 +63,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
@@ -597,7 +597,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