From 253b7a28b22352c18c8080f93c9d531cc48786d7 Mon Sep 17 00:00:00 2001 From: Gabriel Dos Reis Date: Mon, 30 Jan 2006 23:25:16 +0000 Subject: [PATCH] valarray_array.h (__valarray_default_construct): Replace use __is_fundamental with __is_pod. * include/bits/valarray_array.h (__valarray_default_construct): Replace use __is_fundamental with __is_pod. (__valarray_fill_construct): Likewise. (__valarray_copy_construct): Likewise. (__valarray_destroy_elements): Likewise. (__valarray_copy): Likewise. From-SVN: r110414 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/include/bits/valarray_array.h | 18 +++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a2af31ac714e..b2caf0df25c6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2006-01-30 Gabriel Dos Reis + + * include/bits/valarray_array.h (__valarray_default_construct): + Replace use __is_fundamental with __is_pod. + (__valarray_fill_construct): Likewise. + (__valarray_copy_construct): Likewise. + (__valarray_destroy_elements): Likewise. + (__valarray_copy): Likewise. + 2006-01-30 Paolo Carlini * acinclude.m4 ([GLIBCXX_CHECK_C99_TR1]): Do the diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h index 06924fe3ed52..57d56cf253b7 100644 --- a/libstdc++-v3/include/bits/valarray_array.h +++ b/libstdc++-v3/include/bits/valarray_array.h @@ -98,8 +98,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) inline void __valarray_default_construct(_Tp* __restrict__ __b, _Tp* __restrict__ __e) { - _Array_default_ctor<_Tp, __is_fundamental<_Tp>::__value>:: - _S_do_it(__b, __e); + _Array_default_ctor<_Tp, __is_pod<_Tp>::__value>::_S_do_it(__b, __e); } // Turn a raw-memory into an array of _Tp filled with __t @@ -134,8 +133,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __valarray_fill_construct(_Tp* __restrict__ __b, _Tp* __restrict__ __e, const _Tp __t) { - _Array_init_ctor<_Tp, __is_fundamental<_Tp>::__value>:: - _S_do_it(__b, __e, __t); + _Array_init_ctor<_Tp, __is_pod<_Tp>::__value>::_S_do_it(__b, __e, __t); } // @@ -171,8 +169,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const _Tp* __restrict__ __e, _Tp* __restrict__ __o) { - _Array_copy_ctor<_Tp, __is_fundamental<_Tp>::__value>:: - _S_do_it(__b, __e, __o); + _Array_copy_ctor<_Tp, __is_pod<_Tp>::__value>::_S_do_it(__b, __e, __o); } // copy-construct raw array [__o, *) from strided array __a[<__n : __s>] @@ -181,7 +178,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __valarray_copy_construct (const _Tp* __restrict__ __a, size_t __n, size_t __s, _Tp* __restrict__ __o) { - if (__is_fundamental<_Tp>::__value) + if (__is_pod<_Tp>::__value) while (__n--) { *__o++ = *__a; @@ -202,7 +199,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const size_t* __restrict__ __i, _Tp* __restrict__ __o, size_t __n) { - if (__is_fundamental<_Tp>::__value) + if (__is_pod<_Tp>::__value) while (__n--) *__o++ = __a[*__i++]; else @@ -215,7 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) inline void __valarray_destroy_elements(_Tp* __restrict__ __b, _Tp* __restrict__ __e) { - if (!__is_fundamental<_Tp>::__value) + if (!__is_pod<_Tp>::__value) while (__b != __e) { __b->~_Tp(); @@ -279,8 +276,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __valarray_copy(const _Tp* __restrict__ __a, size_t __n, _Tp* __restrict__ __b) { - _Array_copier<_Tp, __is_fundamental<_Tp>::__value>:: - _S_do_it(__a, __n, __b); + _Array_copier<_Tp, __is_pod<_Tp>::__value>::_S_do_it(__a, __n, __b); } // Copy strided array __a[<__n : __s>] in plain __b[<__n>]