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 r11-2632] libstdc++: Implement LWG 561 for std::inserter Date: Mon, 10 Aug 2020 11:32:32 +0000 (GMT) [thread overview] Message-ID: <20200810113232.8873B3857032@sourceware.org> (raw) https://gcc.gnu.org/g:2203a80a72cb582364245b6997d0724a5f84e062 commit r11-2632-g2203a80a72cb582364245b6997d0724a5f84e062 Author: Jonathan Wakely <jwakely@redhat.com> Date: Fri Mar 27 23:55:48 2020 +0000 libstdc++: Implement LWG 561 for std::inserter libstdc++-v3/ChangeLog: * include/bits/stl_iterator.h (inserter): Do not deduce iterator type (LWG 561). * testsuite/24_iterators/insert_iterator/dr561.cc: New test. Diff: --- libstdc++-v3/include/bits/stl_iterator.h | 9 ++--- .../24_iterators/insert_iterator/dr561.cc | 47 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 08e25d842dd..f0cf4c55c09 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -931,13 +931,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inserter(_Container& __x, std::__detail::__range_iter_t<_Container> __i) { return insert_iterator<_Container>(__x, __i); } #else - template<typename _Container, typename _Iterator> + template<typename _Container> inline insert_iterator<_Container> - inserter(_Container& __x, _Iterator __i) - { - return insert_iterator<_Container>(__x, - typename _Container::iterator(__i)); - } + inserter(_Container& __x, typename _Container::iterator __i) + { return insert_iterator<_Container>(__x, __i); } #endif // @} group iterators diff --git a/libstdc++-v3/testsuite/24_iterators/insert_iterator/dr561.cc b/libstdc++-v3/testsuite/24_iterators/insert_iterator/dr561.cc new file mode 100644 index 00000000000..17533990983 --- /dev/null +++ b/libstdc++-v3/testsuite/24_iterators/insert_iterator/dr561.cc @@ -0,0 +1,47 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +// { dg-do compile { target c++11 } } + +// Example from https://wg21.link/lwg561 + +#include <iterator> +#include <string> + +namespace my +{ + +template <class String> +struct my_type {}; + +struct my_container +{ +template <class String> +void push_back(const my_type<String>&); +}; + +template <class String> +void inserter(const my_type<String>& m, my_container& c) {c.push_back(m);} + +} // my + +int main() +{ + my::my_container c; + my::my_type<std::string> m; + inserter(m, c); +}
reply other threads:[~2020-08-10 11:32 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=20200810113232.8873B3857032@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).