From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4AE83383B434; Mon, 28 Jun 2021 15:25:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4AE83383B434 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 r12-1846] libstdc++: Remove redundant explicit instantiations X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 75f948f089ceb8888fd00913635264e20610d0f2 X-Git-Newrev: 084635aa80daa45403aebd86712b2c61779c4173 Message-Id: <20210628152539.4AE83383B434@sourceware.org> Date: Mon, 28 Jun 2021 15:25:39 +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: Mon, 28 Jun 2021 15:25:39 -0000 https://gcc.gnu.org/g:084635aa80daa45403aebd86712b2c61779c4173 commit r12-1846-g084635aa80daa45403aebd86712b2c61779c4173 Author: Jonathan Wakely Date: Mon Jun 28 15:16:08 2021 +0100 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: --- libstdc++-v3/include/bits/streambuf.tcc | 10 ++-------- libstdc++-v3/src/c++11/streambuf-inst.cc | 10 ---------- 2 files changed, 2 insertions(+), 18 deletions(-) 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