mirror of
https://forge.sourceware.org/marek/gcc.git
synced 2026-02-22 12:00:11 -05:00
ee5ab84e5f
As specified in the standard, the predicate for std::erase_if has to be
invocable as non-const with a non-const lvalues argument. Restore
support for predicates that only accept non-const arguments.
It's not strictly nevessary to change it for the set and unordered_set
overloads, because they only give const access to the elements anyway.
I've done it for them too just to keep them all consistent.
libstdc++-v3/ChangeLog:
PR libstdc++/107850
* include/bits/erase_if.h (__erase_nodes_if): Use non-const
reference to the container.
* include/experimental/map (erase_if): Likewise.
* include/experimental/set (erase_if): Likewise.
* include/experimental/unordered_map (erase_if): Likewise.
* include/experimental/unordered_set (erase_if): Likewise.
* include/std/map (erase_if): Likewise.
* include/std/set (erase_if): Likewise.
* include/std/unordered_map (erase_if): Likewise.
* include/std/unordered_set (erase_if): Likewise.
* testsuite/23_containers/map/erasure.cc: Check with
const-incorrect predicate.
* testsuite/23_containers/set/erasure.cc: Likewise.
* testsuite/23_containers/unordered_map/erasure.cc: Likewise.
* testsuite/23_containers/unordered_set/erasure.cc: Likewise.
* testsuite/experimental/map/erasure.cc: Likewise.
* testsuite/experimental/set/erasure.cc: Likewise.
* testsuite/experimental/unordered_map/erasure.cc: Likewise.
* testsuite/experimental/unordered_set/erasure.cc: Likewise.
(cherry picked from commit f54ceb2062)
109 lines
3.5 KiB
C++
109 lines
3.5 KiB
C++
// <unordered_set> -*- C++ -*-
|
|
|
|
// Copyright (C) 2007-2022 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
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file include/unordered_set
|
|
* This is a Standard C++ Library header.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_UNORDERED_SET
|
|
#define _GLIBCXX_UNORDERED_SET 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
#if __cplusplus < 201103L
|
|
# include <bits/c++0x_warning.h>
|
|
#else
|
|
|
|
#include <type_traits>
|
|
#include <initializer_list>
|
|
#include <bits/allocator.h>
|
|
#include <ext/alloc_traits.h>
|
|
#include <ext/aligned_buffer.h>
|
|
#include <bits/stl_pair.h>
|
|
#include <bits/stl_function.h> // equal_to, _Identity, _Select1st
|
|
#include <bits/functional_hash.h>
|
|
#include <bits/hashtable.h>
|
|
#include <bits/unordered_set.h>
|
|
#include <bits/range_access.h>
|
|
#include <bits/erase_if.h>
|
|
|
|
#ifdef _GLIBCXX_DEBUG
|
|
# include <debug/unordered_set>
|
|
#endif
|
|
|
|
#if __cplusplus >= 201703L
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
namespace pmr
|
|
{
|
|
template<typename _Tp> class polymorphic_allocator;
|
|
template<typename _Key, typename _Hash = std::hash<_Key>,
|
|
typename _Pred = std::equal_to<_Key>>
|
|
using unordered_set
|
|
= std::unordered_set<_Key, _Hash, _Pred,
|
|
polymorphic_allocator<_Key>>;
|
|
template<typename _Key, typename _Hash = std::hash<_Key>,
|
|
typename _Pred = std::equal_to<_Key>>
|
|
using unordered_multiset
|
|
= std::unordered_multiset<_Key, _Hash, _Pred,
|
|
polymorphic_allocator<_Key>>;
|
|
} // namespace pmr
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // C++17
|
|
|
|
#if __cplusplus > 201703L
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
template<typename _Key, typename _Hash, typename _CPred, typename _Alloc,
|
|
typename _Predicate>
|
|
inline typename unordered_set<_Key, _Hash, _CPred, _Alloc>::size_type
|
|
erase_if(unordered_set<_Key, _Hash, _CPred, _Alloc>& __cont,
|
|
_Predicate __pred)
|
|
{
|
|
_GLIBCXX_STD_C::unordered_set<_Key, _Hash, _CPred, _Alloc>&
|
|
__ucont = __cont;
|
|
return __detail::__erase_nodes_if(__cont, __ucont, __pred);
|
|
}
|
|
|
|
template<typename _Key, typename _Hash, typename _CPred, typename _Alloc,
|
|
typename _Predicate>
|
|
inline typename unordered_multiset<_Key, _Hash, _CPred, _Alloc>::size_type
|
|
erase_if(unordered_multiset<_Key, _Hash, _CPred, _Alloc>& __cont,
|
|
_Predicate __pred)
|
|
{
|
|
_GLIBCXX_STD_C::unordered_multiset<_Key, _Hash, _CPred, _Alloc>&
|
|
__ucont = __cont;
|
|
return __detail::__erase_nodes_if(__cont, __ucont, __pred);
|
|
}
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // C++20
|
|
|
|
#endif // C++11
|
|
|
|
#endif // _GLIBCXX_UNORDERED_SET
|