public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-5840] libstdc++: [_GLIBCXX_DEBUG] Enhance std::erase_if for vector/deque
@ 2021-12-08 18:10 Franथईois Dumont
0 siblings, 0 replies; only message in thread
From: Franथईois Dumont @ 2021-12-08 18:10 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:e7fac1e1a5858abc9737518ddbdac780fd2ad8b8
commit r12-5840-ge7fac1e1a5858abc9737518ddbdac780fd2ad8b8
Author: François Dumont <fdumont@gcc.gnu.org>
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<typename _Tp, typename _Alloc, typename _Up>
@@ -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<typename _Tp, typename _Alloc, typename _Up>
@@ -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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-08 18:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-08 18:10 [gcc r12-5840] libstdc++: [_GLIBCXX_DEBUG] Enhance std::erase_if for vector/deque Franथईois Dumont
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).