mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-20 09:35:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Fix non-reserved names in <valarray>

Browse Source 
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	* include/std/valarray: Uglify 'func' parameters.
	* testsuite/17_intro/names.cc: Add 'func' to checks.
This commit is contained in:
Jonathan Wakely 2021-08-25 22:24:54 +01:00
parent ead408529d
commit 0163bbaaef
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libstdc++-v3/include/std/valarray
View File

@ -536,25 +536,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* @brief Apply a function to the array.
*
* Returns a new valarray with elements assigned to the result of
* applying func to the corresponding element of this array. The new
* applying __func to the corresponding element of this array. The new
* array has the same size as this one.
*
* @param func Function of Tp returning Tp to apply.
* @param __func Function of Tp returning Tp to apply.
* @return New valarray with transformed elements.
*/
_Expr<_ValFunClos<_ValArray, _Tp>, _Tp> apply(_Tp func(_Tp)) const;
_Expr<_ValFunClos<_ValArray, _Tp>, _Tp> apply(_Tp __func(_Tp)) const;
/**
* @brief Apply a function to the array.
*
* Returns a new valarray with elements assigned to the result of
* applying func to the corresponding element of this array. The new
* applying __func to the corresponding element of this array. The new
* array has the same size as this one.
*
* @param func Function of const Tp& returning Tp to apply.
* @param __func Function of const Tp& returning Tp to apply.
* @return New valarray with transformed elements.
*/
_Expr<_RefFunClos<_ValArray, _Tp>, _Tp> apply(_Tp func(const _Tp&)) const;
_Expr<_RefFunClos<_ValArray, _Tp>, _Tp> apply(_Tp __func(const _Tp&)) const;
/**
* @brief Resize array.
@ -1062,18 +1062,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<class _Tp>
inline _Expr<_ValFunClos<_ValArray, _Tp>, _Tp>
valarray<_Tp>::apply(_Tp func(_Tp)) const
valarray<_Tp>::apply(_Tp __func(_Tp)) const
{
typedef _ValFunClos<_ValArray, _Tp> _Closure;
return _Expr<_Closure, _Tp>(_Closure(*this, func));
return _Expr<_Closure, _Tp>(_Closure(*this, __func));
}
template<class _Tp>
inline _Expr<_RefFunClos<_ValArray, _Tp>, _Tp>
valarray<_Tp>::apply(_Tp func(const _Tp &)) const
valarray<_Tp>::apply(_Tp __func(const _Tp &)) const
{
typedef _RefFunClos<_ValArray, _Tp> _Closure;
return _Expr<_Closure, _Tp>(_Closure(*this, func));
return _Expr<_Closure, _Tp>(_Closure(*this, __func));
}
#define _DEFINE_VALARRAY_UNARY_OPERATOR(_Op, _Name) \

1
libstdc++-v3/testsuite/17_intro/names.cc
View File

@ -106,6 +106,7 @@
#endif
#define z (
#define func (
#define tmp (
#if __cplusplus < 201103L