public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-4266] libstdc++: Define std::wstring_convert unconditionally [PR 98725]
Date: Sat,  9 Oct 2021 00:15:27 +0000 (GMT)	[thread overview]
Message-ID: <20211009001527.C6A683858427@sourceware.org> (raw)

https://gcc.gnu.org/g:3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe

commit r12-4266-g3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Fri Oct 8 14:25:42 2021 +0100

    libstdc++: Define std::wstring_convert unconditionally [PR 98725]
    
    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.

Diff:
---
 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


                 reply	other threads:[~2021-10-09  0:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20211009001527.C6A683858427@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@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).