diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-10-08 14:48:04 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-10-09 00:57:49 +0100 |
| commit | 4997c8b30ecfc82f9e6ce874cbd3840e227522eb (patch) | |
| tree | b3f014be0c8fcdf415aa935b33d16c9264ee984e | |
| parent | 0afb9ebaab09b999f1d158ffc3fb906fdab9df67 (diff) | |
| download | gcc-4997c8b30ecfc82f9e6ce874cbd3840e227522eb.zip gcc-4997c8b30ecfc82f9e6ce874cbd3840e227522eb.tar.gz gcc-4997c8b30ecfc82f9e6ce874cbd3840e227522eb.tar.bz2 | |
libstdc++: Enable vstring for wchar_t unconditionally [PR98725]
None of these vstring specializations depend on libc support for
wchar_t, so can be enabled unconditionally now that char_traits<wchar_t>
is always available.
libstdc++-v3/ChangeLog:
PR libstdc++/98725
* include/ext/rc_string_base.h [!_GLIBCXX_USE_WCHAR_T]
(__rc_string_base<wchar_t>): Define member function.
* include/ext/vstring.h [!_GLIBCXX_USE_WCHAR_T]
(hash<__gnu_cxx::__wvstring>): Define specialization.
* include/ext/vstring_fwd.h [!_GLIBCXX_USE_WCHAR_T] (__wvstring)
(__wsso_string, __wrc_string): Declare typedefs.
| -rw-r--r-- | libstdc++-v3/include/ext/rc_string_base.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/vstring.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/vstring_fwd.h | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index 819f52d..88cc656 100644 --- a/libstdc++-v3/include/ext/rc_string_base.h +++ b/libstdc++-v3/include/ext/rc_string_base.h @@ -719,7 +719,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return false; } -#ifdef _GLIBCXX_USE_WCHAR_T template<> inline bool __rc_string_base<wchar_t, std::char_traits<wchar_t>, @@ -730,7 +729,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return true; return false; } -#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index db02af1..cb5872a 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -2921,7 +2921,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return std::_Hash_impl::hash(__s.data(), __s.length()); } }; -#ifdef _GLIBCXX_USE_WCHAR_T /// std::hash specialization for __wvstring. template<> struct hash<__gnu_cxx::__wvstring> @@ -2932,7 +2931,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return std::_Hash_impl::hash(__s.data(), __s.length() * sizeof(wchar_t)); } }; -#endif /// std::hash specialization for __u16vstring. template<> diff --git a/libstdc++-v3/include/ext/vstring_fwd.h b/libstdc++-v3/include/ext/vstring_fwd.h index 645c328..1aa53fd 100644 --- a/libstdc++-v3/include/ext/vstring_fwd.h +++ b/libstdc++-v3/include/ext/vstring_fwd.h @@ -58,13 +58,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __versa_string<char, std::char_traits<char>, std::allocator<char>, __rc_string_base> __rc_string; -#ifdef _GLIBCXX_USE_WCHAR_T typedef __versa_string<wchar_t> __wvstring; typedef __wvstring __wsso_string; typedef __versa_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t>, __rc_string_base> __wrc_string; -#endif #if __cplusplus >= 201103L typedef __versa_string<char16_t> __u16vstring; |