std_valarray.h (valarray::valarray): Use __valarray_copy, not __valarray_copy_construct.

2000-10-23  Gabriel Dos Reis  <gdr@codesourcery.com>

	* std/std_valarray.h (valarray::valarray): Use __valarray_copy,
	not __valarray_copy_construct.

From-SVN: r37016

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index 26bfd9e1d8e112abf401122bfc31fb3c8a3b5bbd..1b6aac0822222f15a9d37e80011ea7708772bd8c 100644 (file)
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-23  Gabriel Dos Reis  <gdr@codesourcery.com>
+
+       * std/std_valarray.h (valarray::valarray): Use __valarray_copy,
+       not __valarray_copy_construct.
+
 2000-10-08  Philipp Thomas  <pthomas@suse.de>
 
        * Makefile.in (piclist): Fix sed command to also accept

diff --git a/libstdc++/std/std_valarray.h b/libstdc++/std/std_valarray.h
index d32412ce877af7034f70c5be82d5ac60d9d2282a..8d4c94aa045c740fc6325b0ee7a6ab5583ac7ee3 100644 (file)
--- a/libstdc++/std/std_valarray.h
+++ b/libstdc++/std/std_valarray.h
@@ -304,7 +304,7 @@ template<typename _Tp>
 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));
 }
 
@@ -313,7 +313,7 @@ inline valarray<_Tp>::valarray (const gslice_array<_Tp>& __ga)
   : _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);
 }
@@ -322,7 +322,7 @@ template<typename _Tp>
 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);
 }
 
@@ -330,14 +330,14 @@ template<typename _Tp>
 inline valarray<_Tp>::valarray (const indirect_array<_Tp>& __ia)
   : _M_size (__ia._M_sz), _M_data(__valarray_get_storage<_Tp>(__ia._M_size))
 {
-  __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 ()