From 9a89281c4005a51eeed058ca66bcce8df1dd1b24 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 8 Oct 2021 14:26:09 +0100 Subject: [PATCH] libstdc++: Define deleted wchar_t overloads unconditionally [PR 98725] We don't need to have 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&, wchar_t)) (operator<<(basic_ostream&, const wchar_t*)): Always define as deleted. Do not check _GLIBCXX_USE_WCHAR_T. --- libstdc++-v3/include/std/ostream | 4 ---- 1 file changed, 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 basic_ostream& operator<<(basic_ostream&, wchar_t) = delete; -#endif // _GLIBCXX_USE_WCHAR_T #ifdef _GLIBCXX_USE_CHAR8_T template @@ -629,11 +627,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // The following deleted overloads prevent formatting strings as // pointer values. -#ifdef _GLIBCXX_USE_WCHAR_T template basic_ostream& operator<<(basic_ostream&, const wchar_t*) = delete; -#endif // _GLIBCXX_USE_WCHAR_T #ifdef _GLIBCXX_USE_CHAR8_T template -- 2.7.4