aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-10-08 14:26:09 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-10-09 00:57:50 +0100
commit9a89281c4005a51eeed058ca66bcce8df1dd1b24 (patch)
treec59a74bd4a3f16e6b2d71ba25a8d289ed159f664
parent3c9fbc26af6739c7ddf8f0895ae68b530cf88bbe (diff)
downloadgcc-9a89281c4005a51eeed058ca66bcce8df1dd1b24.zip
gcc-9a89281c4005a51eeed058ca66bcce8df1dd1b24.tar.gz
gcc-9a89281c4005a51eeed058ca66bcce8df1dd1b24.tar.bz2
libstdc++: Define deleted wchar_t overloads unconditionally [PR 98725]
We don't need to have <wchar.h> support in order to delete overloads for inserting wide characters into narrow streams. libstdc++-v3/ChangeLog: PR libstdc++/98725 * include/std/ostream (operator<<(basic_ostream<char, Tr>&, wchar_t)) (operator<<(basic_ostream<char, Tr>&, const wchar_t*)): Always define as deleted. Do not check _GLIBCXX_USE_WCHAR_T.
-rw-r--r--libstdc++-v3/include/std/ostream4
1 files changed, 0 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream
index 7d39c57..4d7b9b4 100644
--- a/libstdc++-v3/include/std/ostream
+++ b/libstdc++-v3/include/std/ostream
@@ -533,11 +533,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// The following deleted overloads prevent formatting character values as
// numeric values.
-#ifdef _GLIBCXX_USE_WCHAR_T
template<typename _Traits>
basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, wchar_t) = delete;
-#endif // _GLIBCXX_USE_WCHAR_T
#ifdef _GLIBCXX_USE_CHAR8_T
template<typename _Traits>
@@ -629,11 +627,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// The following deleted overloads prevent formatting strings as
// pointer values.
-#ifdef _GLIBCXX_USE_WCHAR_T
template<typename _Traits>
basic_ostream<char, _Traits>&
operator<<(basic_ostream<char, _Traits>&, const wchar_t*) = delete;
-#endif // _GLIBCXX_USE_WCHAR_T
#ifdef _GLIBCXX_USE_CHAR8_T
template<typename _Traits>