public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/giulianob/heads/autopar_rebase2)] libstdc++: Implement LWG 561 for std::inserter
@ 2020-08-18 1:35 Giuliano Belinassi
0 siblings, 0 replies; only message in thread
From: Giuliano Belinassi @ 2020-08-18 1:35 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:965e5516030d8e270902774e39a2cf6edcf7fcdc
commit 965e5516030d8e270902774e39a2cf6edcf7fcdc
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);
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-18 1:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-18 1:35 [gcc(refs/users/giulianob/heads/autopar_rebase2)] libstdc++: Implement LWG 561 for std::inserter Giuliano Belinassi
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).