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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 16faad2e92c9e648071f6d59d0634ebe90916e07..79919512177169de271c792e2d7931b633936d78 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
 
        PR libstdc++/11722

diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index feb7b1c93e8d118546c53cdea23adb5761c70de0..81a1dce7b5bee03805cea8951de0a880a40cf525 100644 (file)
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -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>
-    struct __is_trivially_copyable
+    struct __is_scalar
     {
       enum
        {

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index b0502da7964846cd5ed630dc1019286ae2c8a9bf..f3f20e6680244d431b7ef34a3dcf7ee579653fc6 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -274,7 +274,7 @@ namespace std
       typedef typename iterator_traits<_II>::value_type _ValueTypeI;
       typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
       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<_OI>::_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<_BI2>::value_type _ValueType2;
       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<_BI2>::_M_type
                             && __are_same<_ValueType1, _ValueType2>::_M_type);
@@ -529,8 +529,8 @@ namespace std
                                  _ForwardIterator>)
       __glibcxx_requires_valid_range(__first, __last);
 
-      const bool __trivial = __is_trivially_copyable<_Tp>::_M_type;
-      std::__fill<__trivial>::fill(__first, __last, __value);
+      const bool __scalar = __is_scalar<_Tp>::_M_type;
+      std::__fill<__scalar>::fill(__first, __last, __value);
     }
 
   // Specialization: for one-byte types we can use memset.
@@ -603,8 +603,8 @@ namespace std
       // concept requirements
       __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _Tp>)
 
-      const bool __trivial = __is_trivially_copyable<_Tp>::_M_type;
-      return std::__fill_n<__trivial>::fill_n(__first, __n, __value);
+      const bool __scalar = __is_scalar<_Tp>::_M_type;
+      return std::__fill_n<__scalar>::fill_n(__first, __n, __value);
     }
 
   template<typename _Size>