OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: [_GLIBCXX_DEBUG] Enhance std::erase_if for vector/deque

Browse Source 
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.
This commit is contained in:
François Dumont 2021-11-21 11:56:40 +01:00
parent 60147c2b7d
commit e7fac1e1a5
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libstdc++-v3/include/std/deque
View File

@ -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

30
libstdc++-v3/include/std/vector
View File

@ -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