mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-06 14:59:39 +02:00
libstdc++: Avoid _GLIBCXX20_CONSTEXPR in C++ >= 20 code sections
libstdc++-v3/ChangeLog: * include/std/vector (std::erase_if, std::erase): Replace _GLIBCXX20_CONSTEXPR with 'constexpr' and remove implied 'inline' keyword. * include/std/string (std::erase_if, std::erase): Likewise.
This commit is contained in:
committed by
François Dumont
parent
b12d5a6ba6
commit
88e9cc95ab
@@ -95,8 +95,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
|
||||
template<typename _CharT, typename _Traits, typename _Alloc,
|
||||
typename _Predicate>
|
||||
_GLIBCXX20_CONSTEXPR
|
||||
inline typename basic_string<_CharT, _Traits, _Alloc>::size_type
|
||||
constexpr typename basic_string<_CharT, _Traits, _Alloc>::size_type
|
||||
erase_if(basic_string<_CharT, _Traits, _Alloc>& __cont, _Predicate __pred)
|
||||
{
|
||||
using namespace __gnu_cxx;
|
||||
@@ -110,8 +109,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
|
||||
template<typename _CharT, typename _Traits, typename _Alloc,
|
||||
typename _Up _GLIBCXX26_DEF_VAL_T(_CharT)>
|
||||
_GLIBCXX20_CONSTEXPR
|
||||
inline typename basic_string<_CharT, _Traits, _Alloc>::size_type
|
||||
constexpr typename basic_string<_CharT, _Traits, _Alloc>::size_type
|
||||
erase(basic_string<_CharT, _Traits, _Alloc>& __cont, const _Up& __value)
|
||||
{ return std::erase_if(__cont, __gnu_cxx::__ops::__equal_to(__value)); }
|
||||
|
||||
|
||||
@@ -112,8 +112,7 @@ namespace std _GLIBCXX_VISIBILITY(default)
|
||||
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
|
||||
template<typename _Tp, typename _Alloc, typename _Predicate>
|
||||
_GLIBCXX20_CONSTEXPR
|
||||
inline typename vector<_Tp, _Alloc>::size_type
|
||||
constexpr typename vector<_Tp, _Alloc>::size_type
|
||||
erase_if(vector<_Tp, _Alloc>& __cont, _Predicate __pred)
|
||||
{
|
||||
using namespace __gnu_cxx;
|
||||
@@ -134,8 +133,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||
|
||||
template<typename _Tp, typename _Alloc,
|
||||
typename _Up _GLIBCXX26_DEF_VAL_T(_Tp)>
|
||||
_GLIBCXX20_CONSTEXPR
|
||||
inline typename vector<_Tp, _Alloc>::size_type
|
||||
constexpr typename vector<_Tp, _Alloc>::size_type
|
||||
erase(vector<_Tp, _Alloc>& __cont, const _Up& __value)
|
||||
{ return std::erase_if(__cont, __gnu_cxx::__ops::__equal_to(__value)); }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user