From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 088813851C3E; Mon, 29 Mar 2021 20:00:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 088813851C3E 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 r10-9558] libstdc++: Implement LWG 561 for std::inserter X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 7958a6503768a9d8ca29f45b1326fda344dad186 X-Git-Newrev: 99d70214759e017d8ab50eb506bfca16cf022026 Message-Id: <20210329200021.088813851C3E@sourceware.org> Date: Mon, 29 Mar 2021 20:00:21 +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, 29 Mar 2021 20:00:21 -0000 https://gcc.gnu.org/g:99d70214759e017d8ab50eb506bfca16cf022026 commit r10-9558-g99d70214759e017d8ab50eb506bfca16cf022026 Author: Jonathan Wakely 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. (cherry picked from commit 2203a80a72cb582364245b6997d0724a5f84e062) 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 3ff38b9f9a2..429df10c190 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -926,13 +926,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inserter(_Container& __x, std::__detail::__range_iter_t<_Container> __i) { return insert_iterator<_Container>(__x, __i); } #else - template + template 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 +// . + +// { dg-do compile { target c++11 } } + +// Example from https://wg21.link/lwg561 + +#include +#include + +namespace my +{ + +template +struct my_type {}; + +struct my_container +{ +template +void push_back(const my_type&); +}; + +template +void inserter(const my_type& m, my_container& c) {c.push_back(m);} + +} // my + +int main() +{ + my::my_container c; + my::my_type m; + inserter(m, c); +}