diff mbox series

[committed] libstdc++: Fix typos in std::filesystem code

Message ID YVjDxuuOLucp+qyf@redhat.com
State New
Headers show
Series [committed] libstdc++: Fix typos in std::filesystem code | expand

Commit Message

Jonathan Wakely Oct. 2, 2021, 8:40 p.m. UTC 
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.

Tested x86_64-linux. Committed to trunk.
commit b7848a2068b2579092e0b1bbe02bdb743eb7db26
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Sat Oct 2 21:18:19 2021

    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.
diff mbox series

Patch

diff --git a/libstdc++-v3/src/c++17/fs_ops.cc b/libstdc++-v3/src/c++17/fs_ops.cc
index cb2dc2c617e..5b7f7edd1c9 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 90ebeba7f01..b3147639cd9 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