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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id E5EC639878E0 for ; Mon, 28 Jun 2021 15:25:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E5EC639878E0 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-545-wOOMpfDkOSW5HSl9W0nUtA-1; Mon, 28 Jun 2021 11:25:54 -0400 X-MC-Unique: wOOMpfDkOSW5HSl9W0nUtA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3589DEC1A1; Mon, 28 Jun 2021 15:25:53 +0000 (UTC) Received: from localhost (unknown [10.33.36.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC45010013D6; Mon, 28 Jun 2021 15:25:52 +0000 (UTC) Date: Mon, 28 Jun 2021 16:25:51 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove redundant explicit instantiations Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="/QVx3C7qTtzQb2Mw" Content-Disposition: inline X-Spam-Status: No, score=-14.0 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Mon, 28 Jun 2021 15:25:58 -0000 --/QVx3C7qTtzQb2Mw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline These function templates are explicitly specialized for char and wchar_t streambufs, so the explicit instantiations do nothing. Remove them, to avoid confusion. libstdc++-v3/ChangeLog: * include/bits/streambuf.tcc (__copy_streambufs_eof): Remove explicit instantiation declarations. * src/c++11/streambuf-inst.cc (__copy_streambufs_eof): Remove explicit instantiation definitions. Tested powerpc64le-linux. Committed to trunk. --/QVx3C7qTtzQb2Mw Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 084635aa80daa45403aebd86712b2c61779c4173 Author: Jonathan Wakely Date: Mon Jun 28 15:16:08 2021 libstdc++: Remove redundant explicit instantiations These function templates are explicitly specialized for char and wchar_t streambufs, so the explicit instantiations do nothing. Remove them, to avoid confusion. libstdc++-v3/ChangeLog: * include/bits/streambuf.tcc (__copy_streambufs_eof): Remove explicit instantiation declarations. * src/c++11/streambuf-inst.cc (__copy_streambufs_eof): Remove explicit instantiation definitions. diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc index cbcfb0c790e..22464c4401c 100644 --- a/libstdc++-v3/include/bits/streambuf.tcc +++ b/libstdc++-v3/include/bits/streambuf.tcc @@ -147,25 +147,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // which are defined via explicit instantiations elsewhere. #if _GLIBCXX_EXTERN_TEMPLATE extern template class basic_streambuf; + extern template streamsize __copy_streambufs(basic_streambuf*, basic_streambuf*); - extern template - streamsize - __copy_streambufs_eof(basic_streambuf*, - basic_streambuf*, bool&); #ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_streambuf; + extern template streamsize __copy_streambufs(basic_streambuf*, basic_streambuf*); - extern template - streamsize - __copy_streambufs_eof(basic_streambuf*, - basic_streambuf*, bool&); #endif #endif diff --git a/libstdc++-v3/src/c++11/streambuf-inst.cc b/libstdc++-v3/src/c++11/streambuf-inst.cc index 497f54e193f..c2c2ee9a688 100644 --- a/libstdc++-v3/src/c++11/streambuf-inst.cc +++ b/libstdc++-v3/src/c++11/streambuf-inst.cc @@ -40,11 +40,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION streamsize __copy_streambufs(basic_streambuf*, basic_streambuf*); - template - streamsize - __copy_streambufs_eof(basic_streambuf*, - basic_streambuf*, bool&); - #ifdef _GLIBCXX_USE_WCHAR_T // wstreambuf template class basic_streambuf; @@ -52,11 +47,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template streamsize __copy_streambufs(basic_streambuf*, basic_streambuf*); - - template - streamsize - __copy_streambufs_eof(basic_streambuf*, - basic_streambuf*, bool&); #endif _GLIBCXX_END_NAMESPACE_VERSION --/QVx3C7qTtzQb2Mw--