aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-10-08 14:25:42 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-10-09 00:57:49 +0100
commit3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe (patch)
tree1b3ee6fa612b088a3bed11e7f7d6b1975ee5e13e
parent4bdb9d618d30fc33d7eaab374baf377fa4e9d955 (diff)
downloadgcc-3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe.zip
gcc-3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe.tar.gz
gcc-3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe.tar.bz2
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.
-rw-r--r--libstdc++-v3/include/bits/locale_conv.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/locale_conv.h b/libstdc++-v3/include/bits/locale_conv.h
index 6af8a5b..41d1723 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