Skip to content

R
riscv-gcc-1
Commit 00386a9b by Gabriel Dos Reis Committed by Gabriel Dos Reis
Options

slice_array.h (_DEFINE_VALARRAY_OPERATOR): Instantiate with new function objects. 

	PR/7491
	* include/bits/slice_array.h(_DEFINE_VALARRAY_OPERATOR):
	Instantiate with new function objects.
	* include/bits/mask_array.h (_DEFINE_VALARRAY_OPERATOR): Likewise.
	Reformat.  Uglify.
	* include/bits/gslice_array.h: Likewise.
	* include/bits/indirect_array.h: Likewise.

From-SVN: r56036
parent 6d9f628e
Showing with 224 additions and 209 deletions
libstdc++-v3/ChangeLog
2002-08-05 Gabriel Dos Reis <gdr@nerim.net>
PR/7491
* include/bits/slice_array.h(_DEFINE_VALARRAY_OPERATOR):
Instantiate with new function objects.
* include/bits/mask_array.h (_DEFINE_VALARRAY_OPERATOR): Likewise.
Reformat. Uglify.
* include/bits/gslice_array.h: Likewise.
* include/bits/indirect_array.h: Likewise.
2002-08-03 Gabriel Dos Reis <gdr@nerim.net> 2002-08-03 Gabriel Dos Reis <gdr@nerim.net>
* testsuite/26_numerics/valarray_name_lookup.cc: Rename from * testsuite/26_numerics/valarray_name_lookup.cc: Rename from
......
libstdc++-v3/include/bits/gslice_array.h
...@@ -41,46 +41,47 @@ ...@@ -41,46 +41,47 @@
namespace std { namespace std {
template<typename _Tp> class gslice_array template<typename _Tp>
class gslice_array
{ {
public: public:
typedef _Tp value_type; typedef _Tp value_type;
void operator= (const valarray<_Tp>&) const; void operator=(const valarray<_Tp>&) const;
void operator*= (const valarray<_Tp>&) const; void operator*=(const valarray<_Tp>&) const;
void operator/= (const valarray<_Tp>&) const; void operator/=(const valarray<_Tp>&) const;
void operator%= (const valarray<_Tp>&) const; void operator%=(const valarray<_Tp>&) const;
void operator+= (const valarray<_Tp>&) const; void operator+=(const valarray<_Tp>&) const;
void operator-= (const valarray<_Tp>&) const; void operator-=(const valarray<_Tp>&) const;
void operator^= (const valarray<_Tp>&) const; void operator^=(const valarray<_Tp>&) const;
void operator&= (const valarray<_Tp>&) const; void operator&=(const valarray<_Tp>&) const;
void operator|= (const valarray<_Tp>&) const; void operator|=(const valarray<_Tp>&) const;
void operator<<=(const valarray<_Tp>&) const; void operator<<=(const valarray<_Tp>&) const;
void operator>>=(const valarray<_Tp>&) const; void operator>>=(const valarray<_Tp>&) const;
void operator=(const _Tp&) const; void operator=(const _Tp&) const;
template<class _Dom> template<class _Dom>
void operator= (const _Expr<_Dom,_Tp>&) const; void operator=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator*= (const _Expr<_Dom,_Tp>&) const; void operator*=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator/= (const _Expr<_Dom,_Tp>&) const; void operator/=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator%= (const _Expr<_Dom,_Tp>&) const; void operator%=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator+= (const _Expr<_Dom,_Tp>&) const; void operator+=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator-= (const _Expr<_Dom,_Tp>&) const; void operator-=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator^= (const _Expr<_Dom,_Tp>&) const; void operator^=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator&= (const _Expr<_Dom,_Tp>&) const; void operator&=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator|= (const _Expr<_Dom,_Tp>&) const; void operator|=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator<<= (const _Expr<_Dom,_Tp>&) const; void operator<<=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator>>= (const _Expr<_Dom,_Tp>&) const; void operator>>=(const _Expr<_Dom,_Tp>&) const;
private: private:
_Array<_Tp> _M_array; _Array<_Tp> _M_array;
...@@ -88,10 +89,10 @@ namespace std { ...@@ -88,10 +89,10 @@ namespace std {
friend class valarray<_Tp>; friend class valarray<_Tp>;
gslice_array (_Array<_Tp>, const valarray<size_t>&); gslice_array(_Array<_Tp>, const valarray<size_t>&);
// this constructor needs to be implemented. // this constructor needs to be implemented.
gslice_array (const gslice_array&); gslice_array(const gslice_array&);
// not implemented // not implemented
gslice_array(); gslice_array();
...@@ -100,70 +101,71 @@ namespace std { ...@@ -100,70 +101,71 @@ namespace std {
template<typename _Tp> template<typename _Tp>
inline inline
gslice_array<_Tp>::gslice_array (_Array<_Tp> __a, gslice_array<_Tp>::gslice_array(_Array<_Tp> __a,
const valarray<size_t>& __i) const valarray<size_t>& __i)
: _M_array (__a), _M_index (__i) {} : _M_array(__a), _M_index(__i) {}
template<typename _Tp> template<typename _Tp>
inline inline
gslice_array<_Tp>::gslice_array (const gslice_array<_Tp>& __a) gslice_array<_Tp>::gslice_array(const gslice_array<_Tp>& __a)
: _M_array (__a._M_array), _M_index (__a._M_index) {} : _M_array(__a._M_array), _M_index(__a._M_index) {}
template<typename _Tp> template<typename _Tp>
inline void inline void
gslice_array<_Tp>::operator= (const _Tp& __t) const gslice_array<_Tp>::operator=(const _Tp& __t) const
{ {
__valarray_fill (_M_array, _Array<size_t>(_M_index), __valarray_fill(_M_array, _Array<size_t>(_M_index),
_M_index.size(), __t); _M_index.size(), __t);
} }
template<typename _Tp> template<typename _Tp>
inline void inline void
gslice_array<_Tp>::operator= (const valarray<_Tp>& __v) const gslice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ {
__valarray_copy (_Array<_Tp> (__v), __v.size (), __valarray_copy(_Array<_Tp>(__v), __v.size(),
_M_array, _Array<size_t>(_M_index)); _M_array, _Array<size_t>(_M_index));
} }
template<typename _Tp> template<typename _Tp>
template<class E> template<class _Dom>
inline void inline void
gslice_array<_Tp>::operator= (const _Expr<E, _Tp>& __e) const gslice_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const
{ {
__valarray_copy (__e, _M_index.size(), _M_array, __valarray_copy (__e, _M_index.size(), _M_array,
_Array<size_t>(_M_index)); _Array<size_t>(_M_index));
} }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(op, name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \
template<typename _Tp> \ template<typename _Tp> \
inline void \ 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_augmented_##_Name(_M_array, _Array<size_t>(_M_index), \
_Array<_Tp> (__v), __v.size ()); \ _Array<_Tp>(__v), __v.size()); \
} \ } \
\ \
template<typename _Tp> template<class E> \ template<typename _Tp> \
inline void \ template<class _Dom> \
gslice_array<_Tp>::operator op##= (const _Expr<E, _Tp>& __e) const \ inline void \
{ \ gslice_array<_Tp>::operator _Op##= (const _Expr<_Dom, _Tp>& __e) const\
_Array_augmented_##name (_M_array, _Array<size_t>(_M_index), __e, \ { \
_Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index), __e,\
_M_index.size()); \ _M_index.size()); \
} }
_DEFINE_VALARRAY_OPERATOR(*, multiplies) _DEFINE_VALARRAY_OPERATOR(*, __multiplies)
_DEFINE_VALARRAY_OPERATOR(/, divides) _DEFINE_VALARRAY_OPERATOR(/, __divides)
_DEFINE_VALARRAY_OPERATOR(%, modulus) _DEFINE_VALARRAY_OPERATOR(%, __modulus)
_DEFINE_VALARRAY_OPERATOR(+, plus) _DEFINE_VALARRAY_OPERATOR(+, __plus)
_DEFINE_VALARRAY_OPERATOR(-, minus) _DEFINE_VALARRAY_OPERATOR(-, __minus)
_DEFINE_VALARRAY_OPERATOR(^, xor) _DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
_DEFINE_VALARRAY_OPERATOR(&, and) _DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
_DEFINE_VALARRAY_OPERATOR(|, or) _DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
_DEFINE_VALARRAY_OPERATOR(<<, shift_left) _DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
_DEFINE_VALARRAY_OPERATOR(>>, shift_right) _DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
......
libstdc++-v3/include/bits/indirect_array.h
// The template and inlines for the -*- C++ -*- indirect_array class. // The template and inlines for the -*- C++ -*- indirect_array class.
// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -48,48 +49,48 @@ namespace std ...@@ -48,48 +49,48 @@ namespace std
typedef _Tp value_type; typedef _Tp value_type;
// XXX: This is a proposed resolution for DR-253. // XXX: This is a proposed resolution for DR-253.
indirect_array& operator= (const indirect_array&); indirect_array& operator=(const indirect_array&);
void operator= (const valarray<_Tp>&) const; void operator=(const valarray<_Tp>&) const;
void operator*= (const valarray<_Tp>&) const; void operator*=(const valarray<_Tp>&) const;
void operator/= (const valarray<_Tp>&) const; void operator/=(const valarray<_Tp>&) const;
void operator%= (const valarray<_Tp>&) const; void operator%=(const valarray<_Tp>&) const;
void operator+= (const valarray<_Tp>&) const; void operator+=(const valarray<_Tp>&) const;
void operator-= (const valarray<_Tp>&) const; void operator-=(const valarray<_Tp>&) const;
void operator^= (const valarray<_Tp>&) const; void operator^=(const valarray<_Tp>&) const;
void operator&= (const valarray<_Tp>&) const; void operator&=(const valarray<_Tp>&) const;
void operator|= (const valarray<_Tp>&) const; void operator|=(const valarray<_Tp>&) const;
void operator<<= (const valarray<_Tp>&) const; void operator<<=(const valarray<_Tp>&) const;
void operator>>= (const valarray<_Tp>&) const; void operator>>=(const valarray<_Tp>&) const;
void operator= (const _Tp&) const; void operator= (const _Tp&) const;
// ~indirect_array(); // ~indirect_array();
template<class _Dom> template<class _Dom>
void operator= (const _Expr<_Dom, _Tp>&) const; void operator=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator*= (const _Expr<_Dom, _Tp>&) const; void operator*=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator/= (const _Expr<_Dom, _Tp>&) const; void operator/=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator%= (const _Expr<_Dom, _Tp>&) const; void operator%=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator+= (const _Expr<_Dom, _Tp>&) const; void operator+=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator-= (const _Expr<_Dom, _Tp>&) const; void operator-=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator^= (const _Expr<_Dom, _Tp>&) const; void operator^=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator&= (const _Expr<_Dom, _Tp>&) const; void operator&=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator|= (const _Expr<_Dom, _Tp>&) const; void operator|=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator<<= (const _Expr<_Dom, _Tp>&) const; void operator<<=(const _Expr<_Dom, _Tp>&) const;
template<class _Dom> template<class _Dom>
void operator>>= (const _Expr<_Dom, _Tp>&) const; void operator>>=(const _Expr<_Dom, _Tp>&) const;
private: private:
indirect_array (const indirect_array&); indirect_array(const indirect_array&);
indirect_array (_Array<_Tp>, size_t, _Array<size_t>); indirect_array(_Array<_Tp>, size_t, _Array<size_t>);
friend class valarray<_Tp>; friend class valarray<_Tp>;
friend class gslice_array<_Tp>; friend class gslice_array<_Tp>;
...@@ -99,19 +100,19 @@ namespace std ...@@ -99,19 +100,19 @@ namespace std
const _Array<_Tp> _M_array; const _Array<_Tp> _M_array;
// not implemented // not implemented
indirect_array (); indirect_array();
}; };
template<typename _Tp> template<typename _Tp>
inline indirect_array<_Tp>::indirect_array(const indirect_array<_Tp>& __a) inline
: _M_sz (__a._M_sz), _M_index (__a._M_index), indirect_array<_Tp>::indirect_array(const indirect_array<_Tp>& __a)
_M_array (__a._M_array) {} : _M_sz(__a._M_sz), _M_index(__a._M_index), _M_array(__a._M_array) {}
template<typename _Tp> template<typename _Tp>
inline inline
indirect_array<_Tp>::indirect_array (_Array<_Tp> __a, size_t __s, indirect_array<_Tp>::indirect_array(_Array<_Tp> __a, size_t __s,
_Array<size_t> __i) _Array<size_t> __i)
: _M_sz (__s), _M_index (__i), _M_array (__a) {} : _M_sz(__s), _M_index(__i), _M_array(__a) {}
template<typename _Tp> template<typename _Tp>
inline indirect_array<_Tp>& inline indirect_array<_Tp>&
...@@ -124,46 +125,47 @@ namespace std ...@@ -124,46 +125,47 @@ namespace std
template<typename _Tp> template<typename _Tp>
inline void inline void
indirect_array<_Tp>::operator= (const _Tp& __t) const indirect_array<_Tp>::operator=(const _Tp& __t) const
{ __valarray_fill(_M_array, _M_index, _M_sz, __t); } { __valarray_fill(_M_array, _M_index, _M_sz, __t); }
template<typename _Tp> template<typename _Tp>
inline void inline void
indirect_array<_Tp>::operator= (const valarray<_Tp>& __v) const indirect_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ __valarray_copy (_Array<_Tp> (__v), _M_sz, _M_array, _M_index); } { __valarray_copy(_Array<_Tp>(__v), _M_sz, _M_array, _M_index); }
template<typename _Tp> template<typename _Tp>
template<class _Dom> template<class _Dom>
inline void inline void
indirect_array<_Tp>::operator= (const _Expr<_Dom,_Tp>& __e) const indirect_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
{ __valarray_copy (__e, _M_sz, _M_array, _M_index); } { __valarray_copy(__e, _M_sz, _M_array, _M_index); }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(op, name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \
template<typename _Tp> \ template<typename _Tp> \
inline void \ 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); \ _Array_augmented_##_Name(_M_array, _M_index, _Array<_Tp>(__v), _M_sz); \
} \ } \
\ \
template<typename _Tp> template<class _Dom> \ template<typename _Tp> \
inline void \ template<class _Dom> \
indirect_array<_Tp>::operator op##= (const _Expr<_Dom,_Tp>& __e) const \ inline void \
{ \ indirect_array<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e) const\
_Array_augmented_##name (_M_array, _M_index, __e, _M_sz); \ { \
} _Array_augmented_##_Name(_M_array, _M_index, __e, _M_sz); \
}
_DEFINE_VALARRAY_OPERATOR(*, multiplies)
_DEFINE_VALARRAY_OPERATOR(/, divides) _DEFINE_VALARRAY_OPERATOR(*, __multiplies)
_DEFINE_VALARRAY_OPERATOR(%, modulus) _DEFINE_VALARRAY_OPERATOR(/, __divides)
_DEFINE_VALARRAY_OPERATOR(+, plus) _DEFINE_VALARRAY_OPERATOR(%, __modulus)
_DEFINE_VALARRAY_OPERATOR(-, minus) _DEFINE_VALARRAY_OPERATOR(+, __plus)
_DEFINE_VALARRAY_OPERATOR(^, xor) _DEFINE_VALARRAY_OPERATOR(-, __minus)
_DEFINE_VALARRAY_OPERATOR(&, and) _DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
_DEFINE_VALARRAY_OPERATOR(|, or) _DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
_DEFINE_VALARRAY_OPERATOR(<<, shift_left) _DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
_DEFINE_VALARRAY_OPERATOR(>>, shift_right) _DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
......
libstdc++-v3/include/bits/mask_array.h
// The template and inlines for the -*- C++ -*- mask_array class. // The template and inlines for the -*- C++ -*- mask_array class.
// Copyright (C) 1997-2001 Free Software Foundation, Inc. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
// Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -41,51 +42,52 @@ ...@@ -41,51 +42,52 @@
namespace std { namespace std {
template <class _Tp> class mask_array template <class _Tp>
class mask_array
{ {
public: public:
typedef _Tp value_type; typedef _Tp value_type;
void operator= (const valarray<_Tp>&) const; void operator=(const valarray<_Tp>&) const;
void operator*= (const valarray<_Tp>&) const; void operator*=(const valarray<_Tp>&) const;
void operator/= (const valarray<_Tp>&) const; void operator/=(const valarray<_Tp>&) const;
void operator%= (const valarray<_Tp>&) const; void operator%=(const valarray<_Tp>&) const;
void operator+= (const valarray<_Tp>&) const; void operator+=(const valarray<_Tp>&) const;
void operator-= (const valarray<_Tp>&) const; void operator-=(const valarray<_Tp>&) const;
void operator^= (const valarray<_Tp>&) const; void operator^=(const valarray<_Tp>&) const;
void operator&= (const valarray<_Tp>&) const; void operator&=(const valarray<_Tp>&) const;
void operator|= (const valarray<_Tp>&) const; void operator|=(const valarray<_Tp>&) const;
void operator<<=(const valarray<_Tp>&) const; void operator<<=(const valarray<_Tp>&) const;
void operator>>=(const valarray<_Tp>&) const; void operator>>=(const valarray<_Tp>&) const;
void operator= (const _Tp&) const; void operator=(const _Tp&) const;
// ~mask_array (); // ~mask_array ();
template<class _Dom> template<class _Dom>
void operator= (const _Expr<_Dom,_Tp>&) const; void operator=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator*= (const _Expr<_Dom,_Tp>&) const; void operator*=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator/= (const _Expr<_Dom,_Tp>&) const; void operator/=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator%= (const _Expr<_Dom,_Tp>&) const; void operator%=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator+= (const _Expr<_Dom,_Tp>&) const; void operator+=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator-= (const _Expr<_Dom,_Tp>&) const; void operator-=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator^= (const _Expr<_Dom,_Tp>&) const; void operator^=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator&= (const _Expr<_Dom,_Tp>&) const; void operator&=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator|= (const _Expr<_Dom,_Tp>&) const; void operator|=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator<<=(const _Expr<_Dom,_Tp>&) const; void operator<<=(const _Expr<_Dom,_Tp>&) const;
template<class _Dom> template<class _Dom>
void operator>>=(const _Expr<_Dom,_Tp>&) const; void operator>>=(const _Expr<_Dom,_Tp>&) const;
private: private:
mask_array (_Array<_Tp>, size_t, _Array<bool>); mask_array(_Array<_Tp>, size_t, _Array<bool>);
friend class valarray<_Tp>; friend class valarray<_Tp>;
const size_t _M_sz; const size_t _M_sz;
...@@ -95,66 +97,64 @@ namespace std { ...@@ -95,66 +97,64 @@ namespace std {
mask_array (const mask_array&); mask_array (const mask_array&);
// not implemented // not implemented
mask_array (); mask_array();
mask_array& operator= (const mask_array&); mask_array& operator=(const mask_array&);
}; };
template<typename _Tp> template<typename _Tp>
inline mask_array<_Tp>::mask_array (const mask_array<_Tp>& a) inline mask_array<_Tp>::mask_array(const mask_array<_Tp>& a)
: _M_sz (a._M_sz), _M_mask (a._M_mask), _M_array (a._M_array) {} : _M_sz(a._M_sz), _M_mask(a._M_mask), _M_array(a._M_array) {}
template<typename _Tp> template<typename _Tp>
inline inline
mask_array<_Tp>::mask_array (_Array<_Tp> __a, size_t __s, _Array<bool> __m) mask_array<_Tp>::mask_array(_Array<_Tp> __a, size_t __s, _Array<bool> __m)
: _M_sz (__s), _M_mask (__m), _M_array (__a) {} : _M_sz(__s), _M_mask(__m), _M_array(__a) {}
// template<typename _Tp>
// inline mask_array<_Tp>::~mask_array () {}
template<typename _Tp> template<typename _Tp>
inline void inline void
mask_array<_Tp>::operator= (const _Tp& __t) const mask_array<_Tp>::operator=(const _Tp& __t) const
{ __valarray_fill (_M_array, _M_sz, _M_mask, __t); } { __valarray_fill(_M_array, _M_sz, _M_mask, __t); }
template<typename _Tp> template<typename _Tp>
inline void inline void
mask_array<_Tp>::operator= (const valarray<_Tp>& __v) const mask_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ __valarray_copy (_Array<_Tp> (__v), __v.size (), _M_array, _M_mask); } { __valarray_copy(_Array<_Tp>(__v), __v.size(), _M_array, _M_mask); }
template<typename _Tp> template<typename _Tp>
template<class E> template<class _Ex>
inline void inline void
mask_array<_Tp>::operator= (const _Expr<E, _Tp>& __e) const mask_array<_Tp>::operator=(const _Expr<_Ex, _Tp>& __e) const
{ __valarray_copy (__e, __e.size (), _M_array, _M_mask); } { __valarray_copy(__e, __e.size(), _M_array, _M_mask); }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(op, name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \
template<typename _Tp> \ template<typename _Tp> \
inline void \ inline void \
mask_array<_Tp>::operator op##= (const valarray<_Tp>& __v) const \ mask_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const \
{ \ { \
_Array_augmented_##name (_M_array, _M_mask, \ _Array_augmented_##_Name(_M_array, _M_mask, \
_Array<_Tp> (__v), __v.size ()); \ _Array<_Tp>(__v), __v.size()); \
} \ } \
\ \
template<typename _Tp> template<class E> \ template<typename _Tp> \
inline void \ template<class _Dom> \
mask_array<_Tp>::operator op##= (const _Expr<E, _Tp>& __e) const \ inline void \
{ \ mask_array<_Tp>::operator _Op##=(const _Expr<_Dom, _Tp>& __e) const\
_Array_augmented_##name (_M_array, _M_mask, __e, __e.size ()); \ { \
} _Array_augmented_##_Name(_M_array, _M_mask, __e, __e.size()); \
}
_DEFINE_VALARRAY_OPERATOR(*, multiplies)
_DEFINE_VALARRAY_OPERATOR(/, divides) _DEFINE_VALARRAY_OPERATOR(*, __multiplies)
_DEFINE_VALARRAY_OPERATOR(%, modulus) _DEFINE_VALARRAY_OPERATOR(/, __divides)
_DEFINE_VALARRAY_OPERATOR(+, plus) _DEFINE_VALARRAY_OPERATOR(%, __modulus)
_DEFINE_VALARRAY_OPERATOR(-, minus) _DEFINE_VALARRAY_OPERATOR(+, __plus)
_DEFINE_VALARRAY_OPERATOR(^, xor) _DEFINE_VALARRAY_OPERATOR(-, __minus)
_DEFINE_VALARRAY_OPERATOR(&, and) _DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
_DEFINE_VALARRAY_OPERATOR(|, or) _DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
_DEFINE_VALARRAY_OPERATOR(<<, shift_left) _DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
_DEFINE_VALARRAY_OPERATOR(>>, shift_right) _DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
......
libstdc++-v3/include/bits/slice_array.h
...@@ -169,41 +169,42 @@ namespace std ...@@ -169,41 +169,42 @@ namespace std
template<typename _Tp> template<typename _Tp>
inline void inline void
slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ __valarray_copy (_Array<_Tp> (__v), _M_array, _M_sz, _M_stride); } { __valarray_copy(_Array<_Tp>(__v), _M_array, _M_sz, _M_stride); }
template<typename _Tp> template<typename _Tp>
template<class _Dom> template<class _Dom>
inline void inline void
slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
{ __valarray_copy (__e, _M_sz, _M_array, _M_stride); } { __valarray_copy(__e, _M_sz, _M_array, _M_stride); }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(_Op,_Name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op,_Name) \
template<typename _Tp> \ template<typename _Tp> \
inline void \ inline void \
slice_array<_Tp>::operator _Op##= (const valarray<_Tp>& __v) const \ slice_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const \
{ \ { \
_Array_augmented_##_Name (_M_array, _M_sz, _M_stride, _Array<_Tp> (__v));\ _Array_augmented_##_Name(_M_array, _M_sz, _M_stride, _Array<_Tp>(__v));\
} \ } \
\ \
template<typename _Tp> template<class _Dom> \ template<typename _Tp> \
inline void \ template<class _Dom> \
slice_array<_Tp>::operator _Op##= (const _Expr<_Dom,_Tp>& __e) const \ inline void \
{ \ slice_array<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e) const\
_Array_augmented_##_Name (_M_array, _M_stride, __e, _M_sz); \ { \
} _Array_augmented_##_Name(_M_array, _M_stride, __e, _M_sz); \
}
_DEFINE_VALARRAY_OPERATOR(*, multiplies)
_DEFINE_VALARRAY_OPERATOR(/, divides) _DEFINE_VALARRAY_OPERATOR(*, __multiplies)
_DEFINE_VALARRAY_OPERATOR(%, modulus) _DEFINE_VALARRAY_OPERATOR(/, __divides)
_DEFINE_VALARRAY_OPERATOR(+, plus) _DEFINE_VALARRAY_OPERATOR(%, __modulus)
_DEFINE_VALARRAY_OPERATOR(-, minus) _DEFINE_VALARRAY_OPERATOR(+, __plus)
_DEFINE_VALARRAY_OPERATOR(^, xor) _DEFINE_VALARRAY_OPERATOR(-, __minus)
_DEFINE_VALARRAY_OPERATOR(&, and) _DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
_DEFINE_VALARRAY_OPERATOR(|, or) _DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
_DEFINE_VALARRAY_OPERATOR(<<, shift_left) _DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
_DEFINE_VALARRAY_OPERATOR(>>, shift_right) _DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
......
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