561078480f
In commit r12-4083 I tried to make the std::erase and std::erase_if function avoid the unnecessary overhead of safe iterators. It didn't work, for two reasons. Firstly, for the RB tree containers the __niter_base function is a no-op (because the iterators aren't random access) so the safe iterators were still used. Secondly, for the cases where __niter_base did remove the safe iterator layer, there was still unnecessary overhead to create a new safe iterator and link it to the container. This solves the problem by simply binding a reference to the non-debug version of the conainer. For normal mode this is a no-op, and for debug mode it binds a reference to the debug container's base class. That means the rest of the function operates directly on the non-debug container, and avoids all checking. For std::basic_string there's no need to unwrap anything, because we use std::basic_string directly in debug mode anyway. libstdc++-v3/ChangeLog: * include/bits/erase_if.h (__erase_nodes_if): Remove redundant __niter_base calls. * include/std/string (erase, erase_if): Likewise. * include/std/deque (erase, erase_if): Access non-debug container directly. * 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. * include/experimental/deque (erase, erase_if): Likewise. * 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.
125 lines
4.1 KiB
C++
125 lines
4.1 KiB
C++
// <deque> -*- C++ -*-
|
|
|
|
// Copyright (C) 2001-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/>.
|
|
|
|
/*
|
|
*
|
|
* Copyright (c) 1994
|
|
* Hewlett-Packard Company
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Hewlett-Packard Company makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*
|
|
*
|
|
* Copyright (c) 1997
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*/
|
|
|
|
/** @file include/deque
|
|
* This is a Standard C++ Library header.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_DEQUE
|
|
#define _GLIBCXX_DEQUE 1
|
|
|
|
#pragma GCC system_header
|
|
|
|
#include <bits/stl_algobase.h>
|
|
#include <bits/allocator.h>
|
|
#include <bits/stl_construct.h>
|
|
#include <bits/stl_uninitialized.h>
|
|
#include <bits/stl_deque.h>
|
|
#include <bits/refwrap.h>
|
|
#include <bits/range_access.h>
|
|
#include <bits/deque.tcc>
|
|
|
|
#ifdef _GLIBCXX_DEBUG
|
|
# include <debug/deque>
|
|
#endif
|
|
|
|
#if __cplusplus >= 201703L
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
namespace pmr
|
|
{
|
|
template<typename _Tp> class polymorphic_allocator;
|
|
template<typename _Tp>
|
|
using deque = std::deque<_Tp, polymorphic_allocator<_Tp>>;
|
|
} // namespace pmr
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // C++17
|
|
|
|
#if __cplusplus > 201703L
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
#define __cpp_lib_erase_if 202002L
|
|
|
|
template<typename _Tp, typename _Alloc, typename _Predicate>
|
|
inline typename deque<_Tp, _Alloc>::size_type
|
|
erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred)
|
|
{
|
|
_GLIBCXX_STD_C::deque<_Tp, _Alloc>& __c = __cont;
|
|
using namespace __gnu_cxx;
|
|
const auto __osz = __c.size();
|
|
const auto __end = __c.end();
|
|
auto __removed = std::__remove_if(__c.begin(), __end,
|
|
__ops::__pred_iter(std::ref(__pred)));
|
|
__c.erase(__removed, __end);
|
|
return __osz - __c.size();
|
|
}
|
|
|
|
template<typename _Tp, typename _Alloc, typename _Up>
|
|
inline typename deque<_Tp, _Alloc>::size_type
|
|
erase(deque<_Tp, _Alloc>& __cont, const _Up& __value)
|
|
{
|
|
_GLIBCXX_STD_C::deque<_Tp, _Alloc>& __c = __cont;
|
|
using namespace __gnu_cxx;
|
|
const auto __osz = __c.size();
|
|
const auto __end = __c.end();
|
|
auto __removed = std::__remove_if(__c.begin(), __end,
|
|
__ops::__iter_equals_val(__value));
|
|
__c.erase(__removed, __end);
|
|
return __osz - __c.size();
|
|
}
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace std
|
|
#endif // C++20
|
|
|
|
#endif /* _GLIBCXX_DEQUE */
|