From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id A12843857C76 for ; Sat, 9 Oct 2021 00:14:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A12843857C76 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-22-58D-zKWKO6uKNHD6JpC0sA-1; Fri, 08 Oct 2021 20:14:00 -0400 X-MC-Unique: 58D-zKWKO6uKNHD6JpC0sA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCCB61808311; Sat, 9 Oct 2021 00:13:59 +0000 (UTC) Received: from localhost (unknown [10.33.37.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 904BB60C05; Sat, 9 Oct 2021 00:13:59 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH 7/8] libstdc++: Define deleted wchar_t overloads unconditionally [PR 98725] Date: Sat, 9 Oct 2021 01:13:50 +0100 Message-Id: <20211009001351.659647-7-jwakely@redhat.com> In-Reply-To: <20211009001351.659647-1-jwakely@redhat.com> References: <20211009001351.659647-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Oct 2021 00:14:14 -0000 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 7d39c5706d5..4d7b9b4ef0b 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.31.1