From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1720) id A42E23858D3C; Wed, 8 Dec 2021 18:10:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A42E23858D3C MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: =?utf-8?b?RnJhbuCkpeCkiG9pcyBEdW1vbnQ=?= To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-5840] libstdc++: [_GLIBCXX_DEBUG] Enhance std::erase_if for vector/deque X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Fran=C3=A7ois_Dumont?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 60147c2b7d987f6142bdc1d2ae83e091fc6a5a45 X-Git-Newrev: e7fac1e1a5858abc9737518ddbdac780fd2ad8b8 Message-Id: <20211208181043.A42E23858D3C@sourceware.org> Date: Wed, 8 Dec 2021 18:10:43 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Dec 2021 18:10:43 -0000 https://gcc.gnu.org/g:e7fac1e1a5858abc9737518ddbdac780fd2ad8b8 commit r12-5840-ge7fac1e1a5858abc9737518ddbdac780fd2ad8b8 Author: François Dumont Date: Sun Nov 21 11:56:40 2021 +0100 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. Diff: --- 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