Skip to content

R
riscv-gcc-1
Commit 774c79ed by Zack Weinberg Committed by Zack Weinberg
Options

gslice_array.h, [...]: Do not paste anything after 'operator' keyword. 

	* std/gslice_array.h, std/indirect_array.h, std/mask_array.h,
	std/slice_array.h, std/std_valarray.h, std/valarray_meta.h:
	Do not paste anything after 'operator' keyword.

From-SVN: r34890
parent 54c69093
Showing with 36 additions and 30 deletions
libstdc++/ChangeLog
2000-07-06 Zack Weinberg <zack@wolery.cumb.org>
* std/gslice_array.h, std/indirect_array.h, std/mask_array.h,
std/slice_array.h, std/std_valarray.h, std/valarray_meta.h:
Do not paste anything after 'operator' keyword.
2000-05-15 David Edelsohn <edelsohn@gnu.org>
* Makefile.in: Change "pic" to depend on $(PICFLAG), not
......
libstdc++/std/gslice_array.h
......@@ -133,7 +133,7 @@ gslice_array<_Tp>::operator= (const _Expr<E, _Tp>& __e) const
#define _DEFINE_VALARRAY_OPERATOR(op, name) \
template<typename _Tp> \
inline void \
gslice_array<_Tp>::operator##op##= (const valarray<_Tp>& __v) const \
gslice_array<_Tp>::operator op##= (const valarray<_Tp>& __v) const \
{ \
_Array_augmented_##name (_M_array, _Array<size_t>(_M_index), \
_Array<_Tp> (__v), __v.size ()); \
......@@ -141,7 +141,7 @@ gslice_array<_Tp>::operator##op##= (const valarray<_Tp>& __v) const \
\
template<typename _Tp> template<class E> \
inline void \
gslice_array<_Tp>::operator##op##= (const _Expr<E, _Tp>& __e) const \
gslice_array<_Tp>::operator op##= (const _Expr<E, _Tp>& __e) const \
{ \
_Array_augmented_##name (_M_array, _Array<size_t>(_M_index), __e, \
_M_index.size()); \
......
libstdc++/std/indirect_array.h
......@@ -123,14 +123,14 @@ indirect_array<_Tp>::operator= (const _Expr<_Dom,_Tp>& __e) const
#define _DEFINE_VALARRAY_OPERATOR(op, name) \
template<typename _Tp> \
inline void \
indirect_array<_Tp>::operator##op##= (const valarray<_Tp>& __v) const \
indirect_array<_Tp>::operator op##= (const valarray<_Tp>& __v) const \
{ \
_Array_augmented_##name (_M_array, _M_index, _Array<_Tp> (__v), _M_sz); \
} \
\
template<typename _Tp> template<class _Dom> \
inline void \
indirect_array<_Tp>::operator##op##= (const _Expr<_Dom,_Tp>& __e) const \
indirect_array<_Tp>::operator op##= (const _Expr<_Dom,_Tp>& __e) const \
{ \
_Array_augmented_##name (_M_array, _M_index, __e, _M_sz); \
}
......
libstdc++/std/mask_array.h
......@@ -119,7 +119,7 @@ mask_array<_T>::operator= (const _Expr<E, _T>& __e) const
#define _DEFINE_VALARRAY_OPERATOR(op, name) \
template<typename _T> \
inline void \
mask_array<_T>::operator##op##= (const valarray<_T>& __v) const \
mask_array<_T>::operator op##= (const valarray<_T>& __v) const \
{ \
_Array_augmented_##name (_M_array, _M_mask, \
_Array<_T> (__v), __v.size ()); \
......@@ -127,7 +127,7 @@ mask_array<_T>::operator##op##= (const valarray<_T>& __v) const \
\
template<typename _T> template<class E> \
inline void \
mask_array<_T>::operator##op##= (const _Expr<E, _T>& __e) const \
mask_array<_T>::operator op##= (const _Expr<E, _T>& __e) const \
{ \
_Array_augmented_##name (_M_array, _M_mask, __e, __e.size ()); \
}
......
libstdc++/std/slice_array.h
......@@ -121,18 +121,18 @@ slice_array<_T>::operator= (const _Expr<_Dom,_T>& __e) const
#define _DEFINE_VALARRAY_OPERATOR(op, name) \
template<typename _T> \
inline void \
slice_array<_T>::operator##op##= (const valarray<_T>& __v) const \
slice_array<_T>::operator op##= (const valarray<_T>& __v) const \
{ \
_Array_augmented_##name (_M_array, _M_sz, _M_stride, _Array<_T> (__v));\
} \
\
template<typename _T> template<class _Dom> \
inline void \
slice_array<_T>::operator##op##= (const _Expr<_Dom,_T>& __e) const \
slice_array<_T>::operator op##= (const _Expr<_Dom,_T>& __e) const \
{ \
_Array_augmented_##name (_M_array, _M_stride, __e, _M_sz); \
}
_DEFINE_VALARRAY_OPERATOR(*, multiplies)
_DEFINE_VALARRAY_OPERATOR(/, divides)
......
libstdc++/std/std_valarray.h
......@@ -567,7 +567,7 @@ valarray<_Tp>::apply (_Tp func (const _Tp &)) const
#define _DEFINE_VALARRAY_UNARY_OPERATOR(_Op, _Name) \
template<typename _Tp> \
inline _Expr<_UnClos<_Name,_ValArray,_Tp>, _Tp> \
valarray<_Tp>::operator##_Op() const \
valarray<_Tp>::operator _Op() const \
{ \
typedef _UnClos<_Name,_ValArray,_Tp> _Closure; \
return _Expr<_Closure, _Tp> (_Closure (*this)); \
......@@ -590,7 +590,7 @@ valarray<_Tp>::apply (_Tp func (const _Tp &)) const
#define _DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(_Op, _Name) \
template<class _Tp> \
inline valarray<_Tp> & \
valarray<_Tp>::operator##_Op##= (const _Tp &__t) \
valarray<_Tp>::operator _Op##= (const _Tp &__t) \
{ \
_Array_augmented_##_Name (_Array<_Tp>(_M_data), _M_size, __t); \
return *this; \
......@@ -598,7 +598,7 @@ valarray<_Tp>::apply (_Tp func (const _Tp &)) const
\
template<class _Tp> \
inline valarray<_Tp> & \
valarray<_Tp>::operator##_Op##= (const valarray<_Tp> &__v) \
valarray<_Tp>::operator _Op##= (const valarray<_Tp> &__v) \
{ \
_Array_augmented_##_Name (_Array<_Tp>(_M_data), _M_size, \
_Array<_Tp>(__v._M_data)); \
......@@ -622,7 +622,7 @@ _DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(>>, shift_right)
#define _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(_Op, _Name) \
template<class _Tp> template<class _Dom> \
inline valarray<_Tp> & \
valarray<_Tp>::operator##_Op##= (const _Expr<_Dom,_Tp> &__e) \
valarray<_Tp>::operator _Op##= (const _Expr<_Dom,_Tp> &__e) \
{ \
_Array_augmented_##_Name (_Array<_Tp>(_M_data), __e, _M_size); \
return *this; \
......@@ -645,7 +645,7 @@ _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(>>, shift_right)
#define _DEFINE_BINARY_OPERATOR(_Op, _Name) \
template<typename _Tp> \
inline _Expr<_BinClos<_Name,_ValArray,_ValArray,_Tp,_Tp>, _Tp> \
operator##_Op (const valarray<_Tp> &__v, const valarray<_Tp> &__w) \
operator _Op (const valarray<_Tp> &__v, const valarray<_Tp> &__w) \
{ \
typedef _BinClos<_Name,_ValArray,_ValArray,_Tp,_Tp> _Closure; \
return _Expr<_Closure, _Tp> (_Closure (__v, __w)); \
......@@ -653,7 +653,7 @@ _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(>>, shift_right)
\
template<typename _Tp> \
inline _Expr<_BinClos<_Name,_ValArray,_Constant,_Tp,_Tp>,_Tp> \
operator##_Op (const valarray<_Tp> &__v, const _Tp &__t) \
operator _Op (const valarray<_Tp> &__v, const _Tp &__t) \
{ \
typedef _BinClos<_Name,_ValArray,_Constant,_Tp,_Tp> _Closure; \
return _Expr<_Closure, _Tp> (_Closure (__v, __t)); \
......@@ -661,7 +661,7 @@ _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(>>, shift_right)
\
template<typename _Tp> \
inline _Expr<_BinClos<_Name,_Constant,_ValArray,_Tp,_Tp>,_Tp> \
operator##_Op (const _Tp &__t, const valarray<_Tp> &__v) \
operator _Op (const _Tp &__t, const valarray<_Tp> &__v) \
{ \
typedef _BinClos<_Name,_Constant,_ValArray,_Tp,_Tp> _Closure; \
return _Expr<_Closure, _Tp> (_Closure (__t, __v)); \
......@@ -683,7 +683,7 @@ _DEFINE_BINARY_OPERATOR(>>, _Shift_right)
#define _DEFINE_LOGICAL_OPERATOR(_Op, _Name) \
template<typename _Tp> \
inline _Expr<_BinClos<_Name,_ValArray,_ValArray,_Tp,_Tp>,bool> \
operator##_Op (const valarray<_Tp> &__v, const valarray<_Tp> &__w) \
operator _Op (const valarray<_Tp> &__v, const valarray<_Tp> &__w) \
{ \
typedef _BinClos<_Name,_ValArray,_ValArray,_Tp,_Tp> _Closure; \
return _Expr<_Closure, bool> (_Closure (__v, __w)); \
......@@ -691,7 +691,7 @@ _DEFINE_BINARY_OPERATOR(>>, _Shift_right)
\
template<class _Tp> \
inline _Expr<_BinClos<_Name,_ValArray,_Constant,_Tp,_Tp>,bool> \
operator##_Op (const valarray<_Tp> &__v, const _Tp &__t) \
operator _Op (const valarray<_Tp> &__v, const _Tp &__t) \
{ \
typedef _BinClos<_Name,_ValArray,_Constant,_Tp,_Tp> _Closure; \
return _Expr<_Closure, bool> (_Closure (__v, __t)); \
......@@ -699,7 +699,7 @@ _DEFINE_BINARY_OPERATOR(>>, _Shift_right)
\
template<class _Tp> \
inline _Expr<_BinClos<_Name,_Constant,_ValArray,_Tp,_Tp>,bool> \
operator##_Op (const _Tp &__t, const valarray<_Tp> &__v) \
operator _Op (const _Tp &__t, const valarray<_Tp> &__v) \
{ \
typedef _BinClos<_Name,_Constant,_ValArray,_Tp,_Tp> _Closure; \
return _Expr<_Closure, bool> (_Closure (__t, __v)); \
......
libstdc++/std/valarray_meta.h
......@@ -755,7 +755,7 @@ _Expr<_Dom,_Tp>::operator! () const
#define _DEFINE_EXPR_UNARY_OPERATOR(_Op, _Name) \
template<class _Dom, typename _Tp> \
inline _Expr<_UnClos<_Name,_Expr,_Dom>,_Tp> \
_Expr<_Dom,_Tp>::operator##_Op () const \
_Expr<_Dom,_Tp>::operator _Op () const \
{ \
typedef _UnClos<_Name,_Expr,_Dom> _Closure; \
return _Expr<_Closure,_Tp> (_Closure (this->_M_closure)); \
......@@ -772,7 +772,7 @@ _Expr<_Dom,_Tp>::operator##_Op () const \
template<class _Dom1, class _Dom2> \
inline _Expr<_BinClos<_Name,_Expr,_Expr,_Dom1,_Dom2>, \
typename _Name<typename _Dom1::value_type>::result_type> \
operator##_Op (const _Expr<_Dom1,typename _Dom1::value_type>& __v, \
operator _Op (const _Expr<_Dom1,typename _Dom1::value_type>& __v, \
const _Expr<_Dom2,typename _Dom2::value_type>& __w) \
{ \
typedef typename _Dom1::value_type _Arg; \
......@@ -784,7 +784,7 @@ operator##_Op (const _Expr<_Dom1,typename _Dom1::value_type>& __v, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_Expr,_Constant,_Dom,typename _Dom::value_type>, \
typename _Name<typename _Dom::value_type>::result_type> \
operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __v, \
operator _Op (const _Expr<_Dom,typename _Dom::value_type>& __v, \
const typename _Dom::value_type& __t) \
{ \
typedef typename _Dom::value_type _Arg; \
......@@ -796,7 +796,7 @@ operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __v, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_Constant,_Expr,typename _Dom::value_type,_Dom>, \
typename _Name<typename _Dom::value_type>::result_type> \
operator##_Op (const typename _Dom::value_type& __t, \
operator _Op (const typename _Dom::value_type& __t, \
const _Expr<_Dom,typename _Dom::value_type>& __v) \
{ \
typedef typename _Dom::value_type _Arg; \
......@@ -808,7 +808,7 @@ operator##_Op (const typename _Dom::value_type& __t, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_Expr,_ValArray,_Dom,typename _Dom::value_type>, \
typename _Name<typename _Dom::value_type>::result_type> \
operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __e, \
operator _Op (const _Expr<_Dom,typename _Dom::value_type>& __e, \
const valarray<typename _Dom::value_type>& __v) \
{ \
typedef typename _Dom::value_type _Arg; \
......@@ -820,7 +820,7 @@ operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __e, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_ValArray,_Expr,typename _Dom::value_type,_Dom>, \
typename _Name<typename _Dom::value_type>::result_type> \
operator##_Op (const valarray<typename _Dom::value_type>& __v, \
operator _Op (const valarray<typename _Dom::value_type>& __v, \
const _Expr<_Dom,typename _Dom::value_type>& __e) \
{ \
typedef typename _Dom::value_type _Tp; \
......@@ -845,7 +845,7 @@ operator##_Op (const valarray<typename _Dom::value_type>& __v, \
#define _DEFINE_EXPR_RELATIONAL_OPERATOR(_Op, _Name) \
template<class _Dom1, class _Dom2> \
inline _Expr<_BinClos<_Name,_Expr,_Expr,_Dom1,_Dom2>, bool> \
operator##_Op (const _Expr<_Dom1,typename _Dom1::value_type>& __v, \
operator _Op (const _Expr<_Dom1,typename _Dom1::value_type>& __v, \
const _Expr<_Dom2,typename _Dom2::value_type>& __w) \
{ \
typedef typename _Dom1::value_type _Arg; \
......@@ -856,7 +856,7 @@ operator##_Op (const _Expr<_Dom1,typename _Dom1::value_type>& __v, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_Expr,_Constant,_Dom,typename _Dom::value_type>, \
bool> \
operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __v, \
operator _Op (const _Expr<_Dom,typename _Dom::value_type>& __v, \
const typename _Dom::value_type& __t) \
{ \
typedef typename _Dom::value_type _Arg; \
......@@ -867,7 +867,7 @@ operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __v, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_Constant,_Expr,typename _Dom::value_type,_Dom>, \
bool> \
operator##_Op (const typename _Dom::value_type& __t, \
operator _Op (const typename _Dom::value_type& __t, \
const _Expr<_Dom,typename _Dom::value_type>& __v) \
{ \
typedef typename _Dom::value_type _Arg; \
......@@ -878,7 +878,7 @@ operator##_Op (const typename _Dom::value_type& __t, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_Expr,_ValArray,_Dom,typename _Dom::value_type>, \
bool> \
operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __e, \
operator _Op (const _Expr<_Dom,typename _Dom::value_type>& __e, \
const valarray<typename _Dom::value_type>& __v) \
{ \
typedef typename _Dom::value_type _Tp; \
......@@ -889,7 +889,7 @@ operator##_Op (const _Expr<_Dom,typename _Dom::value_type>& __e, \
template<class _Dom> \
inline _Expr<_BinClos<_Name,_ValArray,_Expr,typename _Dom::value_type,_Dom>, \
bool> \
operator##_Op (const valarray<typename _Dom::value_type>& __v, \
operator _Op (const valarray<typename _Dom::value_type>& __v, \
const _Expr<_Dom,typename _Dom::value_type>& __e) \
{ \
typedef typename _Dom::value_type _Tp; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment