2005-07-15 Paolo Carlini <pcarlini@suse.de>

	* include/bits/moveable.h: Rename __is_moveable::value -> __value.
	* include/bits/stl_algo.h: Likewise.
	* include/bits/stl_algobase.h: Likewise.
	* include/bits/stl_deque.h: Likewise.
	* include/bits/stl_list.h: Likewise.
	* include/bits/stl_map.h: Likewise.
	* include/bits/stl_multimap.h: Likewise.
	* include/bits/stl_multiset.h: Likewise.
	* include/bits/stl_pair.h: Likewise.
	* include/bits/stl_set.h: Likewise.
	* include/bits/stl_vector.h: Likewise.
	* testsuite/testsuite_rvalref.h: Likewise.


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/libstdcxx_so_7-branch@102065 138bc75d-0d04-0410-961f-82ee72b054a4

13 files changed, 45 insertions, 30 deletions

diff --git a/libstdc++-v3/ChangeLog.libstdcxx_so_7-branch b/libstdc++-v3/ChangeLog.libstdcxx_so_7-branch
index 4b4831283e6..ff8a1074c9c 100644
--- a/libstdc++-v3/ChangeLog.libstdcxx_so_7-branch
+++ b/libstdc++-v3/ChangeLog.libstdcxx_so_7-branch
@@ -1,3 +1,18 @@
+2005-07-15  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/bits/moveable.h: Rename __is_moveable::value -> __value.
+	* include/bits/stl_algo.h: Likewise.
+	* include/bits/stl_algobase.h: Likewise.
+	* include/bits/stl_deque.h: Likewise.
+	* include/bits/stl_list.h: Likewise.
+	* include/bits/stl_map.h: Likewise.
+	* include/bits/stl_multimap.h: Likewise.
+	* include/bits/stl_multiset.h: Likewise.
+	* include/bits/stl_pair.h: Likewise.
+	* include/bits/stl_set.h: Likewise.
+	* include/bits/stl_vector.h: Likewise.
+	* testsuite/testsuite_rvalref.h: Likewise.
+
 2005-07-01  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/ext/sso_string.h (struct __sso_string_base):
diff --git a/libstdc++-v3/include/bits/moveable.h b/libstdc++-v3/include/bits/moveable.h
index 93c6f120837..5a2f2c31890 100644
--- a/libstdc++-v3/include/bits/moveable.h
+++ b/libstdc++-v3/include/bits/moveable.h
@@ -40,7 +40,7 @@ namespace __gnu_cxx
 
   template<class _Tp>
     struct __is_moveable
-    { static const bool value = false; };
+    { static const bool __value = false; };
 
   template<class _Tp>
     struct __rvalref
@@ -51,7 +51,7 @@ namespace __gnu_cxx
       __rvalref(_Tp& __inref) : __ref(__inref) { }
     };
 
-  template<class _Tp, bool = __is_moveable<_Tp>::value>
+  template<class _Tp, bool = __is_moveable<_Tp>::__value>
     struct __move_helper
     {
       typedef _Tp& __type;
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index b31d5a1497e..c904f02266d 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -2368,7 +2368,7 @@ namespace std
   template<typename _RandomAccessIterator, typename _Compare>
     inline typename __enable_if<_RandomAccessIterator, 
       !(__gnu_cxx::__is_moveable<typename iterator_traits<_RandomAccessIterator>
-    				            ::value_type>::value)>::__type
+    				            ::value_type>::__value)>::__type
     __introsort_partition(_RandomAccessIterator __first,
 		          _RandomAccessIterator __last, _Compare __comp)
     {
@@ -2396,7 +2396,7 @@ namespace std
   template<typename _RandomAccessIterator, typename _Compare>
     inline typename __enable_if<_RandomAccessIterator,
       __gnu_cxx::__is_moveable<typename iterator_traits<_RandomAccessIterator>
-    			         ::value_type>::value>::__type
+    			         ::value_type>::__value>::__type
     __introsort_partition(_RandomAccessIterator __first,
                           _RandomAccessIterator __last, _Compare __comp)
     {
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 82973c651c0..b8a763eb803 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -399,10 +399,10 @@ namespace std
   */   
   template<typename _InputIterator, typename _OutputIterator>
     inline typename __enable_if<_OutputIterator,
-      __gnu_cxx::__is_moveable<
-        typename std::iterator_traits<_OutputIterator>::value_type>::value &&
-        __are_same<typename std::iterator_traits<_InputIterator>::value_type,
-		   typename std::iterator_traits<_OutputIterator>::value_type>
+    __gnu_cxx::__is_moveable<
+    typename std::iterator_traits<_OutputIterator>::value_type>::__value
+    && __are_same<typename std::iterator_traits<_InputIterator>::value_type,
+		  typename std::iterator_traits<_OutputIterator>::value_type>
 	  ::__value>::__type
     __move(_InputIterator __first, _InputIterator __last,
            _OutputIterator __result)
@@ -424,10 +424,10 @@ namespace std
   */
   template<typename _InputIterator, typename _OutputIterator>
     inline typename __enable_if<_OutputIterator,
-      !(__gnu_cxx::__is_moveable<
-          typename std::iterator_traits<_OutputIterator>::value_type>::value &&
-          __are_same<typename std::iterator_traits<_InputIterator>::value_type,
-	  	     typename std::iterator_traits<_OutputIterator>::value_type>
+    !(__gnu_cxx::__is_moveable<
+      typename std::iterator_traits<_OutputIterator>::value_type>::__value
+      && __are_same<typename std::iterator_traits<_InputIterator>::value_type,
+                    typename std::iterator_traits<_OutputIterator>::value_type>
 	  ::__value)>::__type
     __move(_InputIterator __first, _InputIterator __last,
            _OutputIterator __result)
@@ -577,10 +577,10 @@ namespace std
   template<typename _InputIterator, typename _OutputIterator>
     inline 
     typename __enable_if<_OutputIterator,
-      __gnu_cxx::__is_moveable<
-        typename iterator_traits<_OutputIterator>::value_type>::value &&
-        __are_same<typename iterator_traits<_InputIterator>::value_type,
-		   typename iterator_traits<_OutputIterator>::value_type>
+    __gnu_cxx::__is_moveable<
+    typename iterator_traits<_OutputIterator>::value_type>::__value
+    && __are_same<typename iterator_traits<_InputIterator>::value_type,
+		  typename iterator_traits<_OutputIterator>::value_type>
 	  ::__value>::__type
     __move_backward(_InputIterator __first, _InputIterator __last,
 		    _OutputIterator __result)
@@ -603,10 +603,10 @@ namespace std
   template<typename _InputIterator, typename _OutputIterator>
     inline 
     typename __enable_if<_OutputIterator,
-      !(__gnu_cxx::__is_moveable<
-          typename iterator_traits<_OutputIterator>::value_type>::value &&
-          __are_same<typename iterator_traits<_InputIterator>::value_type,
-	  	     typename iterator_traits<_OutputIterator>::value_type>
+    !(__gnu_cxx::__is_moveable<
+      typename iterator_traits<_OutputIterator>::value_type>::__value
+      && __are_same<typename iterator_traits<_InputIterator>::value_type,
+                    typename iterator_traits<_OutputIterator>::value_type>
 	  ::__value)>::__type
     __move_backward(_InputIterator __first, _InputIterator __last,
 		    _OutputIterator __result)
diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index a5aff4d112b..736b83b9e8b 100644
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -1555,7 +1555,7 @@ namespace __gnu_cxx
 {
   template<typename _Tp, typename _Alloc>
     struct __is_moveable<_GLIBCXX_STD::deque<_Tp, _Alloc> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif /* _DEQUE_H */
diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h
index 0ce19c65216..8a85dc5dc67 100644
--- a/libstdc++-v3/include/bits/stl_list.h
+++ b/libstdc++-v3/include/bits/stl_list.h
@@ -1253,7 +1253,7 @@ namespace __gnu_cxx
 {
   template<typename _Tp, typename _Alloc>
     struct __is_moveable<_GLIBCXX_STD::list<_Tp, _Alloc> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif /* _LIST_H */
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 650dbf21972..a56d655c83a 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -711,7 +711,7 @@ namespace __gnu_cxx
 {
   template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
     struct __is_moveable<_GLIBCXX_STD::map<_Key, _Tp, _Compare,_Alloc> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif /* _MAP_H */
diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index 89a8492e53e..83702cbad6e 100644
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -689,8 +689,8 @@ namespace _GLIBCXX_STD
 namespace __gnu_cxx
 {
   template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    struct __is_moveable<_GLIBCXX_STD::multimap<_Key, _Tp, _Compare,_Alloc> >
-    { static const bool value = true; };
+    struct __is_moveable<_GLIBCXX_STD::multimap<_Key, _Tp, _Compare, _Alloc> >
+    { static const bool __value = true; };
 }
 
 #endif /* _MULTIMAP_H */
diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index 59da52dfa53..74fcfaf5a93 100644
--- a/libstdc++-v3/include/bits/stl_multiset.h
+++ b/libstdc++-v3/include/bits/stl_multiset.h
@@ -599,7 +599,7 @@ namespace __gnu_cxx
 {
   template <typename _Key, typename _Compare, typename _Alloc>
     struct __is_moveable<_GLIBCXX_STD::multiset<_Key, _Compare, _Alloc> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif /* _MULTISET_H */
diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index a2b867dd19c..9ac41d3f88b 100644
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -169,7 +169,7 @@ namespace __gnu_cxx
 {
   template<typename _T1, typename _T2>
     struct __is_moveable<std::pair<_T1, _T2> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif /* _PAIR_H */
diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h
index 7480b020af3..ad7188a5065 100644
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -609,6 +609,6 @@ namespace __gnu_cxx
 {
   template <typename _Key, typename _Compare, typename _Alloc>
     struct __is_moveable<_GLIBCXX_STD::set<_Key, _Compare, _Alloc> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 #endif /* _SET_H */
diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h
index a6ef864aaad..d5ef32200d2 100644
--- a/libstdc++-v3/include/bits/stl_vector.h
+++ b/libstdc++-v3/include/bits/stl_vector.h
@@ -989,7 +989,7 @@ namespace __gnu_cxx
 {
   template<typename _Tp, typename _Alloc>
     struct __is_moveable<_GLIBCXX_STD::vector<_Tp, _Alloc> >
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif /* _VECTOR_H */
diff --git a/libstdc++-v3/testsuite/testsuite_rvalref.h b/libstdc++-v3/testsuite/testsuite_rvalref.h
index 3ac49408b49..ca912a6d870 100644
--- a/libstdc++-v3/testsuite/testsuite_rvalref.h
+++ b/libstdc++-v3/testsuite/testsuite_rvalref.h
@@ -115,7 +115,7 @@ namespace __gnu_cxx
 {
   template<>
     struct __is_moveable<__gnu_test::rvalstruct>
-    { static const bool value = true; };
+    { static const bool __value = true; };
 }
 
 #endif // _GLIBCXX_TESTSUITE_TR1_H