From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [PATCH 6/8] libstdc++: Define std::wstring_convert unconditionally [PR 98725]
Date: Sat, 9 Oct 2021 01:13:49 +0100 [thread overview]
Message-ID: <20211009001351.659647-6-jwakely@redhat.com> (raw)
In-Reply-To: <20211009001351.659647-1-jwakely@redhat.com>
The wchar_t type is defined unconditionally for C++, so there is no
reason for std::wstring_convert and std::wbuffer_convert to be disabled
when <wchar.h> is not usable. It should be possible to use those class
templates with char16_t and char32_t even if wchar_t conversions don't
work.
libstdc++-v3/ChangeLog:
PR libstdc++/98725
* include/bits/locale_conv.h (wstring_convert, wbuffer_convert):
Define unconditionally. Do not check _GLIBCXX_USE_WCHAR_T.
---
libstdc++-v3/include/bits/locale_conv.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
index 6af8a5bdc8f..41d17238fbd 100644
--- a/libstdc++-v3/include/bits/locale_conv.h
+++ b/libstdc++-v3/include/bits/locale_conv.h
@@ -253,8 +253,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
};
}
-#ifdef _GLIBCXX_USE_WCHAR_T
-
_GLIBCXX_BEGIN_NAMESPACE_CXX11
/// String conversions
@@ -626,8 +624,6 @@ _GLIBCXX_END_NAMESPACE_CXX11
bool _M_always_noconv;
};
-#endif // _GLIBCXX_USE_WCHAR_T
-
/// @} group locales
_GLIBCXX_END_NAMESPACE_VERSION
--
2.31.1
next prev parent reply other threads:[~2021-10-09 0:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-09 0:13 [committed 1/8] libstdc++: Add missing _GLIBCXX_USE_WCHAR_T checks in testsuite Jonathan Wakely
2021-10-09 0:13 ` [PATCH 2/8] libstdc++: Move test that depends on wchar_t I/O to wchar_t sub-directory Jonathan Wakely
2021-10-09 0:13 ` [PATCH 3/8] libstdc++: Always define typedefs and hash functions for wide strings [PR 98725] Jonathan Wakely
2021-10-09 0:13 ` [PATCH 4/8] libstdc++: Enable vstring for wchar_t unconditionally [PR98725] Jonathan Wakely
2021-10-09 0:13 ` [PATCH 5/8] libstdc++: Enable type traits " Jonathan Wakely
2021-10-09 0:13 ` Jonathan Wakely [this message]
2021-10-09 0:13 ` [PATCH 7/8] libstdc++: Define deleted wchar_t overloads unconditionally [PR 98725] Jonathan Wakely
2021-10-09 0:13 ` [PATCH 8/8] libstdc++: Remove unnecessary uses of _GLIBCXX_USE_WCHAR_T in testsuite [PR98725] Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211009001351.659647-6-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).