FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

valarray_after.h (_Expr<>::operator[](slice)): Don't assume the closure implements general indexing...

Browse source 
* include/bits/valarray_after.h (_Expr<>::operator[](slice)):
        Don't assume the closure implements general indexing, as a matter
        of fact, most of them don't.
        (_Expr<>::operator[](const gslice&)): Likewise.
        (_Expr<>::operator[](const valarray<bool>&)): Likewise.
        (_Expr<>::operator[](const valarray<size_t>&)): Likewise.
        (_Expr<>::shift): Fix thinko.
        (_Expr<>::cshift): Likewise.
        (_Expr<>::apply): Likewise.

From-SVN: r108714
This commit is contained in:
Gabriel Dos Reis 2005-12-17 15:36:35 +00:00 • committed by Gabriel Dos Reis
parent 24bd1a0b27
commit ad816b52a4
2 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,15 @@
2005-12-17 Gabriel Dos Reis <gdr@integrable-solutions.net>
* include/bits/valarray_after.h (_Expr<>::operator[](slice)):
Don't assume the closure implements general indexing, as a matter
of fact, most of them don't.
(_Expr<>::operator[](const gslice&)): Likewise.
(_Expr<>::operator[](const valarray<bool>&)): Likewise.
(_Expr<>::operator[](const valarray<size_t>&)): Likewise.
(_Expr<>::shift): Fix thinko.
(_Expr<>::cshift): Likewise.
(_Expr<>::apply): Likewise.
2005-12-16 Paolo Carlini <pcarlini@suse.de>
* testsuite/tr1/4_metaprogramming/type_properties/is_empty/is_empty.cc:

42
libstdc++-v3/include/bits/valarray_after.h
View file

@ -222,47 +222,71 @@ namespace std
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::operator[](slice __s) const
{ return _M_closure[__s]; }
{
valarray<_Tp> __v = valarray<_Tp>(*this)[__s];
return __v;
}
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::operator[](const gslice& __gs) const
{ return _M_closure[__gs]; }
{
valarray<_Tp> __v = valarray<_Tp>(*this)[__gs];
return __v;
}
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::operator[](const valarray<bool>& __m) const
{ return _M_closure[__m]; }
{
valarray<_Tp> __v = valarray<_Tp>(*this)[__m];
return __v;
}
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::operator[](const valarray<size_t>& __i) const
{ return _M_closure[__i]; }
{
valarray<_Tp> __v = valarray<_Tp>(*this)[__i];
return __v;
}
template<class _Clos, typename _Tp>
inline size_t
_Expr<_Clos, _Tp>::size() const
{ return _M_closure.size (); }
{ return _M_closure.size(); }
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::shift(int __n) const
{ return valarray<_Tp>(_M_closure).shift(__n); }
{
valarray<_Tp> __v = valarray<_Tp>(*this).shift(__n);
return __v;
}
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::cshift(int __n) const
{ return valarray<_Tp>(_M_closure).cshift(__n); }
{
valarray<_Tp> __v = valarray<_Tp>(*this).cshift(__n);
return __v;
}
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::apply(_Tp __f(const _Tp&)) const
{ return valarray<_Tp>(_M_closure).apply(__f); }
{
valarray<_Tp> __v = valarray<_Tp>(*this).apply(__f);
return __v;
}
template<class _Clos, typename _Tp>
inline valarray<_Tp>
_Expr<_Clos, _Tp>::apply(_Tp __f(_Tp)) const
{ return valarray<_Tp>(_M_closure).apply(__f); }
{
valarray<_Tp> __v = valarray<_Tp>(*this).apply(__f);
return __v;
}
// XXX: replace this with a more robust summation algorithm.
template<class _Clos, typename _Tp>