82e3a82687
This partially reverts commit 561078480f
.
If we avoid all debug mode checks when erasing elements then we fail to
invalidate safe iterators to the removed elements. This reverts the
recent changes in r12-4083 and r12-4233, restoring the debug checking.
libstdc++-v3/ChangeLog:
* include/experimental/deque (erase, erase_if): Revert changes
to avoid debug mode overhead.
* include/experimental/map (erase, erase_if): Likewise.
* include/experimental/set (erase, erase_if): Likewise.
* include/experimental/unordered_map (erase, erase_if):
Likewise.
* include/experimental/unordered_set (erase, erase_if):
Likewise.
* include/experimental/vector (erase, erase_if): Likewise.
* include/std/deque (erase, erase_if): Likewise.
* include/std/map (erase, erase_if): Likewise.
* include/std/set (erase, erase_if): Likewise.
* include/std/unordered_map (erase, erase_if): Likewise.
* include/std/unordered_set (erase, erase_if): Likewise.
* include/std/vector (erase, erase_if): Likewise.
102 lines
3.4 KiB
C++
102 lines
3.4 KiB
C++
// <unordered_map> -*- C++ -*-
|
|
|
|
// Copyright (C) 2007-2021 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_map
|
|
* This is a Standard C++ Library header.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_UNORDERED_MAP
|
|
#define _GLIBCXX_UNORDERED_MAP 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_map.h>
|
|
#include <bits/range_access.h>
|
|
#include <bits/erase_if.h>
|
|
|
|
#ifdef _GLIBCXX_DEBUG
|
|
# include <debug/unordered_map>
|
|
#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 _Tp, typename _Hash = std::hash<_Key>,
|
|
typename _Pred = std::equal_to<_Key>>
|
|
using unordered_map
|
|
= std::unordered_map<_Key, _Tp, _Hash, _Pred,
|
|
polymorphic_allocator<pair<const _Key, _Tp>>>;
|
|
template<typename _Key, typename _Tp, typename _Hash = std::hash<_Key>,
|
|
typename _Pred = std::equal_to<_Key>>
|
|
using unordered_multimap
|
|
= std::unordered_multimap<_Key, _Tp, _Hash, _Pred,
|
|
polymorphic_allocator<pair<const _Key, _Tp>>>;
|
|
} // 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 _Tp, typename _Hash, typename _CPred,
|
|
typename _Alloc, typename _Predicate>
|
|
inline typename unordered_map<_Key, _Tp, _Hash, _CPred, _Alloc>::size_type
|
|
erase_if(unordered_map<_Key, _Tp, _Hash, _CPred, _Alloc>& __cont,
|
|
_Predicate __pred)
|
|
{ return __detail::__erase_nodes_if(__cont, __pred); }
|
|
|
|
template<typename _Key, typename _Tp, typename _Hash, typename _CPred,
|
|
typename _Alloc, typename _Predicate>
|
|
inline typename unordered_multimap<_Key, _Tp, _Hash, _CPred, _Alloc>::
|
|
size_type
|
|
erase_if(unordered_multimap<_Key, _Tp, _Hash, _CPred, _Alloc>& __cont,
|
|
_Predicate __pred)
|
|
{ return __detail::__erase_nodes_if(__cont, __pred); }
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // C++20
|
|
|
|
#endif // C++11
|
|
|
|
#endif // _GLIBCXX_UNORDERED_MAP
|