[_GLIBCXX_DEBUG] Enhance std::erase_if for vector/deque
Commit Message
I tried to use the same approach I used for node based containers but
got ambiguity on erase calls. I think this simple version will do the work.
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.
Tested under Linux x86_64 normal and _GLIBCXX_DEBUG modes.
Ok to commit ?
François
Comments
On Sun, 21 Nov 2021 at 11:26, François Dumont via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> I tried to use the same approach I used for node based containers but
> got ambiguity on erase calls. I think this simple version will do the work.
>
> 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.
>
> Tested under Linux x86_64 normal and _GLIBCXX_DEBUG modes.
>
> Ok to commit ?
OK, thanks.
@@ -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
@@ -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