Skip to content

R
riscv-gcc-1
Commit 8164237c by Gabriel Dos Reis Committed by Gabriel Dos Reis
Options

indirect_array.h (indirect_array<>::operator=): Make copy and assignment operator public. 

	* include/bits/indirect_array.h (indirect_array<>::operator=):
	Make copy and assignment operator public.  Implement.  Format.

	* include/bits/valarray_array.h (__valarray_copy): Add overloads
	for copy between index arrays.  Format.

From-SVN: r43483
parent c0eadc6b
Showing with 81 additions and 35 deletions
libstdc++-v3/ChangeLog
2001-06-21 Gabriel Dos Reis <gdr@merlin.codesourcery.com>
* include/bits/indirect_array.h (indirect_array<>::operator=):
Make copy and assignment operator public. Implement. Format.
* include/bits/valarray_array.h (__valarray_copy): Add overloads
for copy between index arrays. Format.
2001-06-19 Benjamin Kosnik <bkoz@redhat.com> 2001-06-19 Benjamin Kosnik <bkoz@redhat.com>
* mknumeric_limits: Add static definitions, format. * mknumeric_limits: Add static definitions, format.
......
libstdc++-v3/include/bits/indirect_array.h
...@@ -34,13 +34,17 @@ ...@@ -34,13 +34,17 @@
#pragma GCC system_header #pragma GCC system_header
namespace std { namespace std
{
template <class _Tp> class indirect_array template <class _Tp>
class indirect_array
{ {
public: public:
typedef _Tp value_type; typedef _Tp value_type;
// XXX: This is a proposed resolution for DR-253.
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;
...@@ -91,7 +95,6 @@ namespace std { ...@@ -91,7 +95,6 @@ namespace std {
// not implemented // not implemented
indirect_array (); indirect_array ();
indirect_array& operator= (const indirect_array&);
}; };
template<typename _Tp> template<typename _Tp>
...@@ -105,8 +108,14 @@ namespace std { ...@@ -105,8 +108,14 @@ namespace std {
_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>::~indirect_array() {} inline indirect_array<_Tp>&
indirect_array<_Tp>::operator=(const indirect_array<_Tp>& __a)
{
__valarray_copy(__a._M_array, _M_sz, __a._M_index, _M_array, _M_index);
return *this;
}
template<typename _Tp> template<typename _Tp>
inline void inline void
......
libstdc++-v3/include/bits/valarray_array.h
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
namespace std namespace std
{ {
// //
// Helper functions on raw pointers // Helper functions on raw pointers
// //
...@@ -192,9 +191,9 @@ namespace std ...@@ -192,9 +191,9 @@ namespace std
while (__b != __e) { __b->~_Tp(); ++__b; } while (__b != __e) { __b->~_Tp(); ++__b; }
} }
// fill plain array __a[<__n>] with __t // Fill a plain array __a[<__n>] with __t
template<typename _Tp> template<typename _Tp>
void inline void
__valarray_fill (_Tp* __restrict__ __a, size_t __n, const _Tp& __t) __valarray_fill (_Tp* __restrict__ __a, size_t __n, const _Tp& __t)
{ while (__n--) *__a++ = __t; } { while (__n--) *__a++ = __t; }
...@@ -230,26 +229,27 @@ namespace std ...@@ -230,26 +229,27 @@ namespace std
{ memcpy (__b, __a, __n * sizeof (_Tp)); } { memcpy (__b, __a, __n * sizeof (_Tp)); }
}; };
// Copy a plain array __a[<__n>] into a play array __b[<>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (const _Tp* __restrict__ __a, size_t __n, __valarray_copy(const _Tp* __restrict__ __a, size_t __n,
_Tp* __restrict__ __b) _Tp* __restrict__ __b)
{ {
_Array_copier<_Tp, __is_fundamental<_Tp>::_M_type>:: _Array_copier<_Tp, __is_fundamental<_Tp>::_M_type>::
_S_do_it(__a, __n, __b); _S_do_it(__a, __n, __b);
} }
// copy strided array __a[<__n : __s>] in plain __b[<__n>] // Copy strided array __a[<__n : __s>] in plain __b[<__n>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (const _Tp* __restrict__ __a, size_t __n, size_t __s, __valarray_copy(const _Tp* __restrict__ __a, size_t __n, size_t __s,
_Tp* __restrict__ __b) _Tp* __restrict__ __b)
{ for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b = *__a; } { for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b = *__a; }
// copy plain __a[<__n>] in strided __b[<__n : __s>] // Copy a plain array __a[<__n>] into a strided array __b[<__n : __s>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (const _Tp* __restrict__ __a, _Tp* __restrict__ __b, __valarray_copy(const _Tp* __restrict__ __a, _Tp* __restrict__ __b,
size_t __n, size_t __s) size_t __n, size_t __s)
{ for (size_t __i=0; __i<__n; ++__i, ++__a, __b+=__s) *__b = *__a; } { for (size_t __i=0; __i<__n; ++__i, ++__a, __b+=__s) *__b = *__a; }
...@@ -265,7 +265,7 @@ namespace std ...@@ -265,7 +265,7 @@ namespace std
} }
// copy indexed __a[__i[<__n>]] in plain __b[<__n>] // Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (const _Tp* __restrict__ __a, __valarray_copy (const _Tp* __restrict__ __a,
...@@ -273,13 +273,24 @@ namespace std ...@@ -273,13 +273,24 @@ namespace std
_Tp* __restrict__ __b, size_t __n) _Tp* __restrict__ __b, size_t __n)
{ for (size_t __j=0; __j<__n; ++__j, ++__b, ++__i) *__b = __a[*__i]; } { for (size_t __j=0; __j<__n; ++__j, ++__b, ++__i) *__b = __a[*__i]; }
// copy plain __a[<__n>] in indexed __b[__i[<__n>]] // Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (const _Tp* __restrict__ __a, size_t __n, __valarray_copy (const _Tp* __restrict__ __a, size_t __n,
_Tp* __restrict__ __b, const size_t* __restrict__ __i) _Tp* __restrict__ __b, const size_t* __restrict__ __i)
{ for (size_t __j=0; __j<__n; ++__j, ++__a, ++__i) __b[*__i] = *__a; } { for (size_t __j=0; __j<__n; ++__j, ++__a, ++__i) __b[*__i] = *__a; }
// Copy the __n first elements of an indexed array __src[<__i>] into
// another indexed array __dst[<__j>].
template<typename _Tp>
inline void
__valarray_copy(const _Tp* __restrict__ __src, size_t __n,
const size_t* __restrict__ __i,
_Tp* __restrict__ __dst, const size_t* __restrict__ __j)
{
for (size_t __k = 0; __k < __n; ++__k)
__dst[*__j++] = __src[*__i++];
}
// //
// Compute the sum of elements in range [__f, __l) // Compute the sum of elements in range [__f, __l)
...@@ -376,21 +387,26 @@ namespace std ...@@ -376,21 +387,26 @@ namespace std
size_t __n, const _Tp& __t) size_t __n, const _Tp& __t)
{ __valarray_fill (__a._M_data, __i._M_data, __n, __t); } { __valarray_fill (__a._M_data, __i._M_data, __n, __t); }
// Copy a plain array __a[<__n>] into a play array __b[<>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (_Array<_Tp> __a, size_t __n, _Array<_Tp> __b) __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b)
{ __valarray_copy (__a._M_data, __n, __b._M_data); } { __valarray_copy(__a._M_data, __n, __b._M_data); }
// Copy strided array __a[<__n : __s>] in plain __b[<__n>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (_Array<_Tp> __a, size_t __n, size_t __s, _Array<_Tp> __b) __valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s, _Array<_Tp> __b)
{ __valarray_copy(__a._M_data, __n, __s, __b._M_data); } { __valarray_copy(__a._M_data, __n, __s, __b._M_data); }
// Copy a plain array __a[<__n>] into a strided array __b[<__n : __s>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (_Array<_Tp> __a, _Array<_Tp> __b, size_t __n, size_t __s) __valarray_copy(_Array<_Tp> __a, _Array<_Tp> __b, size_t __n, size_t __s)
{ __valarray_copy (__a._M_data, __b._M_data, __n, __s); } { __valarray_copy(__a._M_data, __b._M_data, __n, __s); }
// Copy strided array __src[<__n : __s1>] into another
// strided array __dst[< : __s2>]. Their sizes must match.
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s1, __valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s1,
...@@ -398,17 +414,30 @@ namespace std ...@@ -398,17 +414,30 @@ namespace std
{ __valarray_copy(__a._M_data, __n, __s1, __b._M_data, __s2); } { __valarray_copy(__a._M_data, __n, __s1, __b._M_data, __s2); }
// Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (_Array<_Tp> __a, _Array<size_t> __i, __valarray_copy(_Array<_Tp> __a, _Array<size_t> __i,
_Array<_Tp> __b, size_t __n) _Array<_Tp> __b, size_t __n)
{ __valarray_copy (__a._M_data, __i._M_data, __b._M_data, __n); } { __valarray_copy(__a._M_data, __i._M_data, __b._M_data, __n); }
// Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
template<typename _Tp> template<typename _Tp>
inline void inline void
__valarray_copy (_Array<_Tp> __a, size_t __n, _Array<_Tp> __b, __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b,
_Array<size_t> __i) _Array<size_t> __i)
{ __valarray_copy (__a._M_data, __n, __b._M_data, __i._M_data); } { __valarray_copy(__a._M_data, __n, __b._M_data, __i._M_data); }
// Copy the __n first elements of an indexed array __src[<__i>] into
// another indexed array __dst[<__j>].
template<typename _Tp>
inline void
__valarray_copy(_Array<_Tp> __src, size_t __n, _Array<size_t> __i,
_Array<_Tp> __dst, _Array<size_t> __j)
{
__valarray_copy(__src._M_data, __n, __i._M_data,
__dst._M_data, __j._M_data);
}
template<typename _Tp> template<typename _Tp>
inline inline
...@@ -569,16 +598,16 @@ _Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m, \ ...@@ -569,16 +598,16 @@ _Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m, \
} \ } \
} }
_DEFINE_ARRAY_FUNCTION(+, plus) _DEFINE_ARRAY_FUNCTION(+, plus)
_DEFINE_ARRAY_FUNCTION(-, minus) _DEFINE_ARRAY_FUNCTION(-, minus)
_DEFINE_ARRAY_FUNCTION(*, multiplies) _DEFINE_ARRAY_FUNCTION(*, multiplies)
_DEFINE_ARRAY_FUNCTION(/, divides) _DEFINE_ARRAY_FUNCTION(/, divides)
_DEFINE_ARRAY_FUNCTION(%, modulus) _DEFINE_ARRAY_FUNCTION(%, modulus)
_DEFINE_ARRAY_FUNCTION(^, xor) _DEFINE_ARRAY_FUNCTION(^, xor)
_DEFINE_ARRAY_FUNCTION(|, or) _DEFINE_ARRAY_FUNCTION(|, or)
_DEFINE_ARRAY_FUNCTION(&, and) _DEFINE_ARRAY_FUNCTION(&, and)
_DEFINE_ARRAY_FUNCTION(<<, shift_left) _DEFINE_ARRAY_FUNCTION(<<, shift_left)
_DEFINE_ARRAY_FUNCTION(>>, shift_right) _DEFINE_ARRAY_FUNCTION(>>, shift_right)
#undef _DEFINE_VALARRAY_FUNCTION #undef _DEFINE_VALARRAY_FUNCTION
......
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