diff options
| author | Edward Smith-Rowland <3dw4rd@verizon.net> | 2018-11-30 16:12:13 +0000 |
|---|---|---|
| committer | Edward Smith-Rowland <emsr@gcc.gnu.org> | 2018-11-30 16:12:13 +0000 |
| commit | 0b44b4b807a2d7bee4d2a0e4c37794db2aeeb44f (patch) | |
| tree | f98bd7fce12f723b38ecedc523dcb4ccfc3763ec /libstdc++-v3/include/std/forward_list | |
| parent | ef33afebf3351fe9f5032ebb735f4ec988e29f06 (diff) | |
| download | gcc-0b44b4b807a2d7bee4d2a0e4c37794db2aeeb44f.tar.gz | |
Pre-emptively support P0646R1 for std container erasure.
2018-11-30 Edward Smith-Rowland <3dw4rd@verizon.net>
Pre-emptively support P0646R1 for std container erasure.
* include/bits/erase_if.h: Accumulate and return number of erased nodes.
* include/std/forward_list (): Return number of erased items.
* include/std/list (): Ditto.
* include/std/map (): Ditto.
* include/std/set (): Ditto.
* include/std/string (): Ditto.
* include/std/unordered_map (): Ditto.
* include/std/unordered_set (): Ditto.
* include/std/vector (): Ditto.
* testsuite/21_strings/basic_string/erasure.cc: Test number of erasures.
* testsuite/23_containers/deque/erasure.cc: Ditto.
* testsuite/23_containers/forward_list/erasure.cc: Ditto.
* testsuite/23_containers/list/erasure.cc: Ditto.
* testsuite/23_containers/map/erasure.cc: Ditto.
* testsuite/23_containers/set/erasure.cc: Ditto.
* testsuite/23_containers/unordered_map/erasure.cc: Ditto.
* testsuite/23_containers/unordered_set/erasure.cc: Ditto.
* testsuite/23_containers/vector/erasure.cc: Ditto.
From-SVN: r266672
Diffstat (limited to 'libstdc++-v3/include/std/forward_list')
| -rw-r--r-- | libstdc++-v3/include/std/forward_list | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list index a2cc90387ad..b094d882048 100644 --- a/libstdc++-v3/include/std/forward_list +++ b/libstdc++-v3/include/std/forward_list @@ -66,16 +66,17 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp, typename _Alloc, typename _Predicate> - inline void + inline typename forward_list<_Tp, _Alloc>::size_type erase_if(forward_list<_Tp, _Alloc>& __cont, _Predicate __pred) - { __cont.remove_if(__pred); } + { return __cont.remove_if(__pred); } template<typename _Tp, typename _Alloc, typename _Up> - inline void + inline typename forward_list<_Tp, _Alloc>::size_type 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; }); + return erase_if(__cont, + [&](__elem_type& __elem) { return __elem == __value; }); } _GLIBCXX_END_NAMESPACE_VERSION } // namespace std |