From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E15733857C6C; Wed, 24 Nov 2021 11:51:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E15733857C6C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-9295] libstdc++: Define deleted wchar_t overloads unconditionally [PR 98725] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 58752dd237e95d06c080c7669f039a2c7cfac938 X-Git-Newrev: ecc43c92151141e3e862a344f753516dc6d5d967 Message-Id: <20211124115148.E15733857C6C@sourceware.org> Date: Wed, 24 Nov 2021 11:51:48 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2021 11:51:49 -0000 https://gcc.gnu.org/g:ecc43c92151141e3e862a344f753516dc6d5d967 commit r11-9295-gecc43c92151141e3e862a344f753516dc6d5d967 Author: Jonathan Wakely Date: Fri Oct 8 14:26:09 2021 +0100 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. (cherry picked from commit 9a89281c4005a51eeed058ca66bcce8df1dd1b24) Diff: --- 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 722d4ff61b5..3569ee1a722 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -539,11 +539,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 @@ -635,11 +633,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