From e7fac1e1a5858abc9737518ddbdac780fd2ad8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dumont?= Date: Sun, 21 Nov 2021 11:56:40 +0100 Subject: [PATCH] libstdc++: [_GLIBCXX_DEBUG] Enhance std::erase_if for vector/deque libstdc++-v3/ChangeLog: * include/std/deque (erase_if): Use _GLIBCXX_STD_C container reference and __niter_wrap to limit _GLIBCXX_DEBUG mode impact. * include/std/vector (erase_if): Likewise. --- libstdc++-v3/include/std/deque | 30 ++++++++++++++++++++++-------- libstdc++-v3/include/std/vector | 30 ++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque index 473479c44ac..0a3541af554 100644 --- a/libstdc++-v3/include/std/deque +++ b/libstdc++-v3/include/std/deque @@ -96,12 +96,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred) { using namespace __gnu_cxx; + _GLIBCXX_STD_C::deque<_Tp, _Alloc>& __ucont = __cont; const auto __osz = __cont.size(); - const auto __end = __cont.end(); - auto __removed = std::__remove_if(__cont.begin(), __end, + const auto __end = __ucont.end(); + auto __removed = std::__remove_if(__ucont.begin(), __end, __ops::__pred_iter(std::ref(__pred))); - __cont.erase(__removed, __end); - return __osz - __cont.size(); + if (__removed != __end) + { + __cont.erase(__niter_wrap(__cont.begin(), __removed), + __cont.end()); + return __osz - __cont.size(); + } + + return 0; } template @@ -109,12 +116,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION erase(deque<_Tp, _Alloc>& __cont, const _Up& __value) { using namespace __gnu_cxx; + _GLIBCXX_STD_C::deque<_Tp, _Alloc>& __ucont = __cont; const auto __osz = __cont.size(); - const auto __end = __cont.end(); - auto __removed = std::__remove_if(__cont.begin(), __end, + const auto __end = __ucont.end(); + auto __removed = std::__remove_if(__ucont.begin(), __end, __ops::__iter_equals_val(__value)); - __cont.erase(__removed, __end); - return __osz - __cont.size(); + if (__removed != __end) + { + __cont.erase(__niter_wrap(__cont.begin(), __removed), + __cont.end()); + return __osz - __cont.size(); + } + + return 0; } _GLIBCXX_END_NAMESPACE_VERSION } // namespace std diff --git a/libstdc++-v3/include/std/vector b/libstdc++-v3/include/std/vector index 890b0ddb3eb..b648b3d7309 100644 --- a/libstdc++-v3/include/std/vector +++ b/libstdc++-v3/include/std/vector @@ -107,12 +107,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION erase_if(vector<_Tp, _Alloc>& __cont, _Predicate __pred) { using namespace __gnu_cxx; + _GLIBCXX_STD_C::vector<_Tp, _Alloc>& __ucont = __cont; const auto __osz = __cont.size(); - const auto __end = __cont.end(); - auto __removed = std::__remove_if(__cont.begin(), __end, + const auto __end = __ucont.end(); + auto __removed = std::__remove_if(__ucont.begin(), __end, __ops::__pred_iter(std::ref(__pred))); - __cont.erase(__removed, __end); - return __osz - __cont.size(); + if (__removed != __end) + { + __cont.erase(__niter_wrap(__cont.begin(), __removed), + __cont.end()); + return __osz - __cont.size(); + } + + return 0; } template @@ -121,12 +128,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION erase(vector<_Tp, _Alloc>& __cont, const _Up& __value) { using namespace __gnu_cxx; + _GLIBCXX_STD_C::vector<_Tp, _Alloc>& __ucont = __cont; const auto __osz = __cont.size(); - const auto __end = __cont.end(); - auto __removed = std::__remove_if(__cont.begin(), __end, + const auto __end = __ucont.end(); + auto __removed = std::__remove_if(__ucont.begin(), __end, __ops::__iter_equals_val(__value)); - __cont.erase(__removed, __end); - return __osz - __cont.size(); + if (__removed != __end) + { + __cont.erase(__niter_wrap(__cont.begin(), __removed), + __cont.end()); + return __osz - __cont.size(); + } + + return 0; } _GLIBCXX_END_NAMESPACE_VERSION } // namespace std