public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-1846] libstdc++: Remove redundant explicit instantiations Date: Mon, 28 Jun 2021 15:25:39 +0000 (GMT) [thread overview] Message-ID: <20210628152539.4AE83383B434@sourceware.org> (raw) https://gcc.gnu.org/g:084635aa80daa45403aebd86712b2c61779c4173 commit r12-1846-g084635aa80daa45403aebd86712b2c61779c4173 Author: Jonathan Wakely <jwakely@redhat.com> 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<char>; + extern template streamsize __copy_streambufs(basic_streambuf<char>*, basic_streambuf<char>*); - extern template - streamsize - __copy_streambufs_eof(basic_streambuf<char>*, - basic_streambuf<char>*, bool&); #ifdef _GLIBCXX_USE_WCHAR_T extern template class basic_streambuf<wchar_t>; + extern template streamsize __copy_streambufs(basic_streambuf<wchar_t>*, basic_streambuf<wchar_t>*); - extern template - streamsize - __copy_streambufs_eof(basic_streambuf<wchar_t>*, - basic_streambuf<wchar_t>*, 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<char>*, basic_streambuf<char>*); - template - streamsize - __copy_streambufs_eof(basic_streambuf<char>*, - basic_streambuf<char>*, bool&); - #ifdef _GLIBCXX_USE_WCHAR_T // wstreambuf template class basic_streambuf<wchar_t>; @@ -52,11 +47,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template streamsize __copy_streambufs(basic_streambuf<wchar_t>*, basic_streambuf<wchar_t>*); - - template - streamsize - __copy_streambufs_eof(basic_streambuf<wchar_t>*, - basic_streambuf<wchar_t>*, bool&); #endif _GLIBCXX_END_NAMESPACE_VERSION
reply other threads:[~2021-06-28 15:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210628152539.4AE83383B434@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).