]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix <experimental/filesystem> for Windows [PR95048]
authorJonathan Wakely <jwakely@redhat.com>
Fri, 11 Nov 2022 22:25:14 +0000 (22:25 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Fri, 11 Nov 2022 22:28:03 +0000 (22:28 +0000)
I meant to include this change in r13-3909-gb331bf303bdc1e but I forgot
to sync it from the machine where I did the mingw testing to the one
where I pushed the commit.

libstdc++-v3/ChangeLog:

PR libstdc++/95048
* include/experimental/bits/fs_path.h (path::_Cvt::_S_wconvert):
Construct codecvt directly instead of getting it from the
locale.

libstdc++-v3/include/experimental/bits/fs_path.h

index 6e2f47f5e63d4ad6ffe164c28b9d7bcdfa4d18a3..a493e17a37e4d2676c0b9ad8c155592efc7e72dd 100644 (file)
@@ -792,8 +792,7 @@ namespace __detail
       static string_type
       _S_wconvert(const char* __f, const char* __l, const char*)
       {
-       using _Cvt = std::codecvt_utf8_utf16<wchar_t>;
-       const auto& __cvt = std::use_facet<_Cvt>(std::locale{});
+       std::codecvt_utf8_utf16<wchar_t> __cvt;
        std::wstring __wstr;
        if (__str_codecvt_in_all(__f, __l, __wstr, __cvt))
            return __wstr;