diff --git a/libstdc++-v3/include/ext/rc_string_base.h b/libstdc++-v3/include/ext/rc_string_base.h index 819f52dc914..88cc656448a 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, @@ -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 db02af18cb1..cb5872a7030 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 645c328104f..1aa53fdc24a 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, std::allocator, __rc_string_base> __rc_string; -#ifdef _GLIBCXX_USE_WCHAR_T typedef __versa_string __wvstring; typedef __wvstring __wsso_string; typedef __versa_string, std::allocator, __rc_string_base> __wrc_string; -#endif #if __cplusplus >= 201103L typedef __versa_string __u16vstring;