From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 42F4639558A4; Thu, 14 Jan 2021 22:27:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42F4639558A4 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] don't use wchar_t as default in locale_conv if wchar_t is not in use X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: 61998ae96691105b1c8ea79db6276a66c8f46a28 X-Git-Newrev: d54adc3f2f72c95217cbfcae1c89fb0b1e60a320 Message-Id: <20210114222735.42F4639558A4@sourceware.org> Date: Thu, 14 Jan 2021 22:27:35 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2021 22:27:35 -0000 https://gcc.gnu.org/g:d54adc3f2f72c95217cbfcae1c89fb0b1e60a320 commit d54adc3f2f72c95217cbfcae1c89fb0b1e60a320 Author: Jonathan Wakely Date: Thu Jan 14 19:23:22 2021 -0300 don't use wchar_t as default in locale_conv if wchar_t is not in use Diff: --- libstdc++-v3/include/bits/locale_conv.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h index 0e409da9876..d8a4d0851f4 100644 --- a/libstdc++-v3/include/bits/locale_conv.h +++ b/libstdc++-v3/include/bits/locale_conv.h @@ -222,11 +222,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif // _GLIBCXX_USE_CHAR8_T #ifdef _GLIBCXX_USE_WCHAR_T +# define _GLIBCXX_WCHAR_DEFAULT_TEMPL_ARG = wchar_t +#else +// wstring_convert and wbuffer_convert are still defined for targets without +// wchar_t support, but the second template argument must be given explictly. +# define _GLIBCXX_WCHAR_DEFAULT_TEMPL_ARG +#endif _GLIBCXX_BEGIN_NAMESPACE_CXX11 /// String conversions - template, typename _Byte_alloc = allocator> class wstring_convert @@ -382,7 +388,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_CXX11 /// Buffer conversions - template> class wbuffer_convert : public basic_streambuf<_Elem, _Tr> { @@ -606,8 +612,6 @@ _GLIBCXX_END_NAMESPACE_CXX11 bool _M_always_noconv; }; -#endif // _GLIBCXX_USE_WCHAR_T - /// @} group locales _GLIBCXX_END_NAMESPACE_VERSION