diff options
| author | Gabriel Dos Reis <gdr@codesourcery.com> | 2000-10-26 08:49:10 +0000 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@gcc.gnu.org> | 2000-10-26 08:49:10 +0000 |
| commit | 95faa9a15e04b7a929c2b9f72b758bd5dcedba9b (patch) | |
| tree | 168b4327f7130a967f5863f97b8ff10da287d41d | |
| parent | db23c0ad0c530ce4de5de7ba9c4906511c1d1849 (diff) | |
| download | gcc-95faa9a15e04b7a929c2b9f72b758bd5dcedba9b.zip gcc-95faa9a15e04b7a929c2b9f72b758bd5dcedba9b.tar.gz gcc-95faa9a15e04b7a929c2b9f72b758bd5dcedba9b.tar.bz2 | |
std_valarray.h (valarray::valarray): Fix thinko.
* include/bits/std_valarray.h (valarray::valarray): Fix thinko.
Use __valarray_copy_construct only where appropriate.
From-SVN: r37070
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/std_valarray.h | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b1c0457..b0e779a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2000-10-26 Gabriel Dos Reis <gdr@codesourcery.com> + + * include/bits/std_valarray.h (valarray::valarray): Fix thinko. + Use __valarray_copy_construct only where appropriate. + 2000-10-25 Mark Mitchell <mark@codesourcery.com> * Makefile.in (check): Don't make mkcheck executable. diff --git a/libstdc++-v3/include/bits/std_valarray.h b/libstdc++-v3/include/bits/std_valarray.h index fa43c6d..f42d7a0 100644 --- a/libstdc++-v3/include/bits/std_valarray.h +++ b/libstdc++-v3/include/bits/std_valarray.h @@ -281,7 +281,7 @@ namespace std { inline valarray<_Tp>::valarray (const slice_array<_Tp>& __sa) : _M_size(__sa._M_sz), _M_data(__valarray_get_storage<_Tp>(__sa._M_sz)) { - __valarray_copy_construct + __valarray_copy (__sa._M_array, __sa._M_sz, __sa._M_stride, _Array<_Tp>(_M_data)); } @@ -290,7 +290,7 @@ namespace std { : _M_size(__ga._M_index.size()), _M_data(__valarray_get_storage<_Tp>(_M_size)) { - __valarray_copy_construct + __valarray_copy (__ga._M_array, _Array<size_t>(__ga._M_index), _Array<_Tp>(_M_data), _M_size); } @@ -299,7 +299,7 @@ namespace std { inline valarray<_Tp>::valarray (const mask_array<_Tp>& __ma) : _M_size(__ma._M_sz), _M_data(__valarray_get_storage<_Tp>(__ma._M_sz)) { - __valarray_copy_construct + __valarray_copy (__ma._M_array, __ma._M_mask, _Array<_Tp>(_M_data), _M_size); } @@ -307,14 +307,14 @@ namespace std { inline valarray<_Tp>::valarray (const indirect_array<_Tp>& __ia) : _M_size(__ia._M_sz), _M_data(__valarray_get_storage<_Tp>(__ia._M_sz)) { - __valarray_copy_construct + __valarray_copy (__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size); } template<typename _Tp> template<class _Dom> inline valarray<_Tp>::valarray (const _Expr<_Dom, _Tp>& __e) : _M_size(__e.size ()), _M_data(__valarray_get_storage<_Tp>(_M_size)) - { __valarray_copy_construct (__e, _M_size, _Array<_Tp>(_M_data)); } + { __valarray_copy (__e, _M_size, _Array<_Tp>(_M_data)); } template<typename _Tp> inline valarray<_Tp>::~valarray () |