OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpp_type_traits.h: Rename __is_trivially_copyable to __is_scalar... 

2004-09-14  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/cpp_type_traits.h: Rename __is_trivially_copyable
	to __is_scalar, more clear and consistent with "tr1" naming.
	* include/bits/stl_algobase.h: Update consistently throughout.

From-SVN: r87497
This commit is contained in:
Paolo Carlini 2004-09-14 18:35:21 +00:00 committed by Paolo Carlini
parent a6e1aa26d9
commit 67dd4a9377
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2004-09-14 Paolo Carlini <pcarlini@suse.de>
* include/bits/cpp_type_traits.h: Rename __is_trivially_copyable
to __is_scalar, more clear and consistent with "tr1" naming.
* include/bits/stl_algobase.h: Update consistently throughout.
2004-09-13 Paolo Carlini <pcarlini@suse.de> 2004-09-13 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/11722 PR libstdc++/11722

4
libstdc++-v3/include/bits/cpp_type_traits.h
View File

@ -378,10 +378,10 @@ namespace std
}; };
// //
// A trivially copyable type is an arithmetic type or a pointer type // A scalar type is an arithmetic type or a pointer type
// //
template<typename _Tp> template<typename _Tp>
struct __is_trivially_copyable struct __is_scalar
{ {
enum enum
{ {

12
libstdc++-v3/include/bits/stl_algobase.h
View File

@ -274,7 +274,7 @@ namespace std
typedef typename iterator_traits<_II>::value_type _ValueTypeI; typedef typename iterator_traits<_II>::value_type _ValueTypeI;
typedef typename iterator_traits<_OI>::value_type _ValueTypeO; typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category; typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_trivially_copyable<_ValueTypeI>::_M_type const bool __simple = (__is_scalar<_ValueTypeI>::_M_type
&& __is_pointer<_II>::_M_type && __is_pointer<_II>::_M_type
&& __is_pointer<_OI>::_M_type && __is_pointer<_OI>::_M_type
&& __are_same<_ValueTypeI, _ValueTypeO>::_M_type); && __are_same<_ValueTypeI, _ValueTypeO>::_M_type);
@ -399,7 +399,7 @@ namespace std
typedef typename iterator_traits<_BI1>::value_type _ValueType1; typedef typename iterator_traits<_BI1>::value_type _ValueType1;
typedef typename iterator_traits<_BI2>::value_type _ValueType2; typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category; typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_trivially_copyable<_ValueType1>::_M_type const bool __simple = (__is_scalar<_ValueType1>::_M_type
&& __is_pointer<_BI1>::_M_type && __is_pointer<_BI1>::_M_type
&& __is_pointer<_BI2>::_M_type && __is_pointer<_BI2>::_M_type
&& __are_same<_ValueType1, _ValueType2>::_M_type); && __are_same<_ValueType1, _ValueType2>::_M_type);
@ -529,8 +529,8 @@ namespace std
_ForwardIterator>) _ForwardIterator>)
__glibcxx_requires_valid_range(__first, __last); __glibcxx_requires_valid_range(__first, __last);
const bool __trivial = __is_trivially_copyable<_Tp>::_M_type; const bool __scalar = __is_scalar<_Tp>::_M_type;
std::__fill<__trivial>::fill(__first, __last, __value); std::__fill<__scalar>::fill(__first, __last, __value);
} }
// Specialization: for one-byte types we can use memset. // Specialization: for one-byte types we can use memset.
@ -603,8 +603,8 @@ namespace std
// concept requirements // concept requirements
__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _Tp>) __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _Tp>)
const bool __trivial = __is_trivially_copyable<_Tp>::_M_type; const bool __scalar = __is_scalar<_Tp>::_M_type;
return std::__fill_n<__trivial>::fill_n(__first, __n, __value); return std::__fill_n<__scalar>::fill_n(__first, __n, __value);
} }
template<typename _Size> template<typename _Size>