From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 36385 invoked by alias); 30 Apr 2015 14:45:04 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 36257 invoked by uid 89); 30 Apr 2015 14:45:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.4 required=5.0 tests=AWL,BAYES_50,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_NONE,SPF_PASS,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: vms173009pub.verizon.net Received: from vms173009pub.verizon.net (HELO vms173009pub.verizon.net) (206.46.173.9) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 30 Apr 2015 14:44:53 +0000 Received: from [192.168.1.3] ([173.67.5.214]) by vms173009.mailsrvcs.net (Oracle Communications Messaging Server 7.0.5.32.0 64bit (built Jul 16 2014)) with ESMTPA id <0NNM003XSJM9YJ40@vms173009.mailsrvcs.net>; Thu, 30 Apr 2015 09:44:34 -0500 (CDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=ZJdgQs+z c=1 sm=1 tr=0 a=EgxZNPMZQWYqNIP3PIRi2A==:117 a=FurB0epzNeMA:10 a=o1OHuDzbAAAA:8 a=oR5dmqMzAAAA:8 a=hTZS6uLwhHpx5LOQAS/v3KalXBI=:19 a=-9mUelKeXuEA:10 a=e9J7MTPGsLIA:10 a=r77TgQKjGQsHNAKrUKIA:9 a=9iDbn-4jx3cA:10 a=cKsnjEOsciEA:10 a=gZbpxnkM3yUA:10 a=6p7V8VHmFsv5siypmm0A:9 a=pILNOxqGKmIA:10 a=6OMVdxpRCxiRYAa72xgA:9 a=QEXdDO2ut3YA:10 a=mDV3o1hIAAAA:8 a=J5nbGwUYxheAI4gVJqIA:9 a=i_C1xOsB1bQwuSIr:21 a=V_PK5gVJ5KqNpIDD:21 Message-id: <55423FD1.3090301@verizon.net> Date: Thu, 30 Apr 2015 15:02:00 -0000 From: Ed Smith-Rowland <3dw4rd@verizon.net> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-version: 1.0 To: Jonathan Wakely Cc: gcc-patches , "libstdc++@gcc.gnu.org" Subject: Re: [PATCH] [libstdc++] Add uniform container erasure. References: <55421311.90905@verizon.net> <20150430123911.GS3618@redhat.com> In-reply-to: <20150430123911.GS3618@redhat.com> Content-type: multipart/mixed; boundary=------------060803040507040609050805 X-SW-Source: 2015-04/txt/msg02043.txt.bz2 This is a multi-part message in MIME format. --------------060803040507040609050805 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-length: 983 > And make_array, which isn't in the working paper yet, so I'd prefer to > leave that part out for now. D'oh! Sorry about that.. Removed. > The Doxygen @headername command tells users which header they are > supposed to include, rather than this one. Since there is no > header that's wrong. I'd just omit the @headername. Done. > This file doesn't really seem like a .tcc to me, it isn't providing > definitions of templates declared elsewhere (specifically in an > erase_if.h header). > > Maybe we want an experimental/bits/ directory for this sort of thing > (which I could also use for the filesystem headers I'm about to > commit) but in the meanwhile I think just experimental/erase_if.h is a > better name. Done. (I didn't make experimental/bits - I'll move erase_if.h after you add the bits directory). > OK for trunk with those changes (remove make_array, rename erase_if.tcc) Rebuilt, retested and committed as 222630. Altered patch attached. Thanks, Ed --------------060803040507040609050805 Content-Type: text/plain; charset=UTF-8; name="CL_erasure" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="CL_erasure" Content-length: 1063 2015-04-30 Edward Smith-Rowland <3dw4rd@verizon.net> Add fundamentals TR container erasure. * include/Makefile.am: Add new headers. * include/Makefile.in: Add new headers. * include/experimental/array: New. * include/experimental/deque: New. * include/experimental/erase_if.tcc: New. * include/experimental/forward_list: New. * include/experimental/list: New. * include/experimental/map: New. * include/experimental/set: New. * include/experimental/string: New. * include/experimental/unordered_map: New. * include/experimental/unordered_set: New. * include/experimental/vector: New. * testsuite/experimental/deque/erasure.cc: New. * testsuite/experimental/forward_list/erasure.cc: New. * testsuite/experimental/list/erasure.cc: New. * testsuite/experimental/map/erasure.cc: New. * testsuite/experimental/set/erasure.cc: New. * testsuite/experimental/string/erasure.cc: New. * testsuite/experimental/unordered_map/erasure.cc: New. * testsuite/experimental/unordered_set/erasure.cc: New. * testsuite/experimental/vector/erasure.cc: New. --------------060803040507040609050805 Content-Type: text/plain; charset=UTF-8; name="patch_erasure" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch_erasure" Content-length: 43265 Index: include/Makefile.am =================================================================== --- include/Makefile.am (revision 222599) +++ include/Makefile.am (working copy) @@ -646,14 +646,24 @@ ${experimental_srcdir}/algorithm \ ${experimental_srcdir}/any \ ${experimental_srcdir}/chrono \ + ${experimental_srcdir}/deque \ + ${experimental_srcdir}/erase_if.h \ + ${experimental_srcdir}/forward_list \ ${experimental_srcdir}/functional \ + ${experimental_srcdir}/list \ + ${experimental_srcdir}/map \ ${experimental_srcdir}/optional \ ${experimental_srcdir}/ratio \ + ${experimental_srcdir}/set \ + ${experimental_srcdir}/string \ ${experimental_srcdir}/string_view \ + ${experimental_srcdir}/string_view.tcc \ ${experimental_srcdir}/system_error \ - ${experimental_srcdir}/string_view.tcc \ ${experimental_srcdir}/tuple \ - ${experimental_srcdir}/type_traits + ${experimental_srcdir}/type_traits \ + ${experimental_srcdir}/unordered_map \ + ${experimental_srcdir}/unordered_set \ + ${experimental_srcdir}/vector # This is the common subset of C++ files that all three "C" header models use. c_base_srcdir = $(C_INCLUDE_DIR) Index: include/Makefile.in =================================================================== --- include/Makefile.in (revision 222599) +++ include/Makefile.in (working copy) @@ -913,14 +913,24 @@ ${experimental_srcdir}/algorithm \ ${experimental_srcdir}/any \ ${experimental_srcdir}/chrono \ + ${experimental_srcdir}/deque \ + ${experimental_srcdir}/erase_if.h \ + ${experimental_srcdir}/forward_list \ ${experimental_srcdir}/functional \ + ${experimental_srcdir}/list \ + ${experimental_srcdir}/map \ ${experimental_srcdir}/optional \ ${experimental_srcdir}/ratio \ + ${experimental_srcdir}/set \ + ${experimental_srcdir}/string \ ${experimental_srcdir}/string_view \ + ${experimental_srcdir}/string_view.tcc \ ${experimental_srcdir}/system_error \ - ${experimental_srcdir}/string_view.tcc \ ${experimental_srcdir}/tuple \ - ${experimental_srcdir}/type_traits + ${experimental_srcdir}/type_traits \ + ${experimental_srcdir}/unordered_map \ + ${experimental_srcdir}/unordered_set \ + ${experimental_srcdir}/vector # This is the common subset of C++ files that all three "C" header models use. Index: include/experimental/deque =================================================================== --- include/experimental/deque (revision 0) +++ include/experimental/deque (working copy) @@ -0,0 +1,72 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/deque + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_DEQUE +#define _GLIBCXX_EXPERIMENTAL_DEQUE 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred) + { + __cont.erase(std::remove_if(__cont.begin(), __cont.end(), __pred), + __cont.end()); + } + + template + void + erase(deque<_Tp, _Alloc>& __cont, const _Up& __value) + { + __cont.erase(std::remove(__cont.begin(), __cont.end(), __value), + __cont.end()); + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_DEQUE Index: include/experimental/erase_if.h =================================================================== --- include/experimental/erase_if.h (revision 0) +++ include/experimental/erase_if.h (working copy) @@ -0,0 +1,70 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/erase_if.h + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_ERASE_IF_H +#define _GLIBCXX_EXPERIMENTAL_ERASE_IF_H 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +namespace std +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ + + namespace __detail + { + template + void + __erase_nodes_if(_Container& __cont, _Predicate __pred) + { + for (auto __iter = __cont.begin(), __last = __cont.end(); + __iter != __last;) + { + if (__pred(*__iter)) + __iter = __cont.erase(__iter); + else + ++__iter; + } + } + } + + +} // inline namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_ERASE_IF_H Index: include/experimental/forward_list =================================================================== --- include/experimental/forward_list (revision 0) +++ include/experimental/forward_list (working copy) @@ -0,0 +1,67 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/forward_list + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_FORWARD_LIST +#define _GLIBCXX_EXPERIMENTAL_FORWARD_LIST 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(forward_list<_Tp, _Alloc>& __cont, _Predicate __pred) + { __cont.remove_if(__pred); } + + template + void erase(forward_list<_Tp, _Alloc>& __cont, const _Up& __value) + { + using __elem_type = typename forward_list<_Tp, _Alloc>::value_type; + erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; }); + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_FORWARD_LIST Index: include/experimental/list =================================================================== --- include/experimental/list (revision 0) +++ include/experimental/list (working copy) @@ -0,0 +1,68 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/list + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_LIST +#define _GLIBCXX_EXPERIMENTAL_LIST 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(list<_Tp, _Alloc>& __cont, _Predicate __pred) + { __cont.remove_if(__pred); } + + template + void + erase(list<_Tp, _Alloc>& __cont, const _Up& __value) + { + using __elem_type = typename list<_Tp, _Alloc>::value_type; + erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; }); + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_LIST Index: include/experimental/map =================================================================== --- include/experimental/map (revision 0) +++ include/experimental/map (working copy) @@ -0,0 +1,68 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/map + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_MAP +#define _GLIBCXX_EXPERIMENTAL_MAP 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(map<_Key, _Tp, _Compare, _Alloc>& __cont, _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + + template + void + erase_if(multimap<_Key, _Tp, _Compare, _Alloc>& __cont, _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_MAP Index: include/experimental/set =================================================================== --- include/experimental/set (revision 0) +++ include/experimental/set (working copy) @@ -0,0 +1,68 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/set + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_SET +#define _GLIBCXX_EXPERIMENTAL_SET 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(set<_Key, _Compare, _Alloc>& __cont, _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + + template + void + erase_if(multiset<_Key, _Compare, _Alloc>& __cont, _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_SET Index: include/experimental/string =================================================================== --- include/experimental/string (revision 0) +++ include/experimental/string (working copy) @@ -0,0 +1,73 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/string + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_STRING +#define _GLIBCXX_EXPERIMENTAL_STRING 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(basic_string<_CharT, _Traits, _Alloc>& __cont, _Predicate __pred) + { + __cont.erase(std::remove_if(__cont.begin(), __cont.end(), __pred), + __cont.end()); + } + + template + void + erase(basic_string<_CharT, _Traits, _Alloc>& __cont, const _Up& __value) + { + __cont.erase(std::remove(__cont.begin(), __cont.end(), __value), + __cont.end()); + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_STRING Index: include/experimental/unordered_map =================================================================== --- include/experimental/unordered_map (revision 0) +++ include/experimental/unordered_map (working copy) @@ -0,0 +1,70 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/unordered_map + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_UNORDERED_MAP +#define _GLIBCXX_EXPERIMENTAL_UNORDERED_MAP 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(unordered_map<_Key, _Tp, _Hash, _CPred, _Alloc>& __cont, + _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + + template + void + erase_if(unordered_multimap<_Key, _Tp, _Hash, _CPred, _Alloc>& __cont, + _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_UNORDERED_MAP Index: include/experimental/unordered_set =================================================================== --- include/experimental/unordered_set (revision 0) +++ include/experimental/unordered_set (working copy) @@ -0,0 +1,70 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/unordered_set + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_UNORDERED_SET +#define _GLIBCXX_EXPERIMENTAL_UNORDERED_SET 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(unordered_set<_Key, _Hash, _CPred, _Alloc>& __cont, + _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + + template + void + erase_if(unordered_multiset<_Key, _Hash, _CPred, _Alloc>& __cont, + _Predicate __pred) + { __detail::__erase_nodes_if(__cont, __pred); } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_UNORDERED_SET Index: include/experimental/vector =================================================================== --- include/experimental/vector (revision 0) +++ include/experimental/vector (working copy) @@ -0,0 +1,72 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/vector + * This is a TS C++ Library header. + */ + +#ifndef _GLIBCXX_EXPERIMENTAL_VECTOR +#define _GLIBCXX_EXPERIMENTAL_VECTOR 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + + template + void + erase_if(vector<_Tp, _Alloc>& __cont, _Predicate __pred) + { + __cont.erase(std::remove_if(__cont.begin(), __cont.end(), __pred), + __cont.end()); + } + + template + void + erase(vector<_Tp, _Alloc>& __cont, const _Up& __value) + { + __cont.erase(std::remove(__cont.begin(), __cont.end(), __value), + __cont.end()); + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // C++14 + +#endif // _GLIBCXX_EXPERIMENTAL_VECTOR Index: testsuite/experimental/deque/erasure.cc =================================================================== --- testsuite/experimental/deque/erasure.cc (revision 0) +++ testsuite/experimental/deque/erasure.cc (working copy) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +void +test01() +{ + bool test [[gnu::unused]] = true; + + auto is_odd = [](const int i) { return i % 2 != 0; }; + + std::deque d{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase_if(d, is_odd); + std::deque t{ 10, 12, 14, 18 }; + VERIFY( d == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::deque d{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase(d, 14); + std::deque t{ 10, 11, 12, 15, 17, 18, 19 }; + VERIFY( d == t ); + std::experimental::erase(d, 20); + VERIFY( d == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/forward_list/erasure.cc =================================================================== --- testsuite/experimental/forward_list/erasure.cc (revision 0) +++ testsuite/experimental/forward_list/erasure.cc (working copy) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +void +test01() +{ + bool test [[gnu::unused]] = true; + + auto is_odd = [](const int i) { return i % 2 != 0; }; + + std::forward_list fl{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase_if(fl, is_odd); + std::forward_list t{ 10, 12, 14, 18 }; + VERIFY( fl == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::forward_list fl{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase(fl, 14); + std::forward_list t{ 10, 11, 12, 15, 17, 18, 19 }; + VERIFY( fl == t ); + std::experimental::erase(fl, 20); + VERIFY( fl == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/list/erasure.cc =================================================================== --- testsuite/experimental/list/erasure.cc (revision 0) +++ testsuite/experimental/list/erasure.cc (working copy) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +void +test01() +{ + bool test [[gnu::unused]] = true; + + auto is_odd = [](const int i) { return i % 2 != 0; }; + + std::list l{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase_if(l, is_odd); + std::list t{ 10, 12, 14, 18 }; + VERIFY( l == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::list l{ 0, 11, 0, 0, 22, 33, 0, 0, 44, 0 }; + std::experimental::erase(l, 0); + std::list t{ 11, 22, 33, 44 }; + VERIFY( l == t ); + std::experimental::erase(l, 55); + VERIFY( l == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/map/erasure.cc =================================================================== --- testsuite/experimental/map/erasure.cc (revision 0) +++ testsuite/experimental/map/erasure.cc (working copy) @@ -0,0 +1,66 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +auto is_odd_pair = [](const std::pair& p) +{ + return p.first % 2 != 0; +}; + +void +test01() +{ + bool test [[gnu::unused]] = true; + + std::map m{ { 10, "A" }, { 11, "B" }, + { 12, "C" }, { 14, "D" }, + { 15, "E" }, { 17, "F" }, + { 18, "G" }, { 19, "H" } }; + std::experimental::erase_if(m, is_odd_pair); + std::map t{ { 10, "A" }, { 12, "C" }, + { 14, "D" }, { 18, "G" } }; + VERIFY( m == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::multimap mm{ { 20, "S" }, { 21, "T" }, + { 22, "U" }, { 22, "V" }, + { 23, "W" }, { 23, "X" }, + { 24, "Y" }, { 25, "Z" } }; + std::experimental::erase_if(mm, is_odd_pair); + std::multimap t{ { 20, "S" }, { 22, "U" }, + { 22, "V" }, { 24, "Y" } }; + VERIFY( mm == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/set/erasure.cc =================================================================== --- testsuite/experimental/set/erasure.cc (revision 0) +++ testsuite/experimental/set/erasure.cc (working copy) @@ -0,0 +1,55 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +auto is_odd = [](const int i) { return i % 2 != 0; }; + +void +test01() +{ + bool test [[gnu::unused]] = true; + + std::set s{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase_if(s, is_odd); + std::set t{ 10, 12, 14, 18 }; + VERIFY( s == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::multiset ms{ 20, 21, 22, 22, 23, 23, 24, 25 }; + std::experimental::erase_if(ms, is_odd); + std::multiset t{ 20, 22, 22, 24 }; + VERIFY( ms == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/string/erasure.cc =================================================================== --- testsuite/experimental/string/erasure.cc (revision 0) +++ testsuite/experimental/string/erasure.cc (working copy) @@ -0,0 +1,58 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +void +test01() +{ + bool test [[gnu::unused]] = true; + + auto is_vowel = [](const char c) + { + return c == 'a' || c == 'e' || c == 'i' || c == 'o' || c == 'u'; + }; + + std::string str("cute fluffy kittens"); + std::experimental::erase_if(str, is_vowel); + VERIFY( str == "ct flffy kttns" ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::string str = "cute fluffy kittens"; + std::experimental::erase(str, 'f'); + VERIFY( str == "cute luy kittens" ); + std::experimental::erase(str, 'z'); + VERIFY( str == "cute luy kittens" ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/unordered_map/erasure.cc =================================================================== --- testsuite/experimental/unordered_map/erasure.cc (revision 0) +++ testsuite/experimental/unordered_map/erasure.cc (working copy) @@ -0,0 +1,66 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +auto is_odd_pair = [](const std::pair& p) +{ + return p.first % 2 != 0; +}; + +void +test01() +{ + bool test [[gnu::unused]] = true; + + std::unordered_map um{ { 10, "A" }, { 11, "B" }, + { 12, "C" }, { 14, "D" }, + { 15, "E" }, { 17, "F" }, + { 18, "G" }, { 19, "H" } }; + std::experimental::erase_if(um, is_odd_pair); + std::unordered_map t{ { 10, "A" }, { 12, "C" }, + { 14, "D" }, { 18, "G" } }; + VERIFY( um == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::unordered_multimap umm{ { 20, "S" }, { 21, "T" }, + { 22, "U" }, { 22, "V" }, + { 23, "W" }, { 23, "X" }, + { 24, "Y" }, { 25, "Z" } }; + std::experimental::erase_if(umm, is_odd_pair); + std::unordered_multimap t{ { 20, "S" }, { 22, "U" }, + { 22, "V" }, { 24, "Y" } }; + VERIFY( umm == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/unordered_set/erasure.cc =================================================================== --- testsuite/experimental/unordered_set/erasure.cc (revision 0) +++ testsuite/experimental/unordered_set/erasure.cc (working copy) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +void +test01() +{ + bool test [[gnu::unused]] = true; + + auto is_odd = [](const int i) { return i % 2 != 0; }; + + std::unordered_set us{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase_if(us, is_odd); + std::unordered_set t{ 10, 12, 14, 18 }; + VERIFY( us == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + auto is_odd = [](const int i) { return i % 2 != 0; }; + + std::unordered_multiset ums{ 20, 21, 22, 22, 23, 23, 24, 25 }; + std::experimental::erase_if(ums, is_odd); + std::unordered_multiset t{ 20, 22, 22, 24 }; + VERIFY( ums == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} Index: testsuite/experimental/vector/erasure.cc =================================================================== --- testsuite/experimental/vector/erasure.cc (revision 0) +++ testsuite/experimental/vector/erasure.cc (working copy) @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++14" } +// { dg-do run } + +// Copyright (C) 2015 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 moved_to of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +void +test01() +{ + bool test [[gnu::unused]] = true; + + auto is_odd = [](const int i) { return i % 2 != 0; }; + + std::vector v{ 10, 11, 12, 14, 15, 17, 18, 19 }; + std::experimental::erase_if(v, is_odd); + std::vector t{ 10, 12, 14, 18 }; + VERIFY( v == t ); +} + +void +test02() +{ + bool test [[gnu::unused]] = true; + + std::vector v{ 0, 11, 0, 0, 22, 33, 0, 0, 44, 0 }; + std::experimental::erase(v, 0); + std::vector t{ 11, 22, 33, 44 }; + VERIFY( v == t ); + std::experimental::erase(v, 55); + VERIFY( v == t ); +} + +int +main() +{ + test01(); + test02(); + + return 0; +} --------------060803040507040609050805--