base.h (plus, multiplies): Use __typeof__, not typeof.

2008-06-26  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/parallel/base.h (plus, multiplies): Use __typeof__,
	not typeof.

From-SVN: r137145

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 78c000ffb103e8846e7777053653eeb900ef0e66..b159b9ef602ccd0296c5ba8a6168b14bc8159f58 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-26  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/parallel/base.h (plus, multiplies): Use __typeof__,
+       not typeof.
+
 2008-06-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
        * testsuite/29_atomics/atomic_flag/cons/default.cc: Avoid -Wall

diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h
index b713ee7a41091fc9ec70630fd7358e6c1dc152e4..54c26d8ca6d58d2bf1c66545d9d27555abd0f754 100644 (file)
--- a/libstdc++-v3/include/parallel/base.h
+++ b/libstdc++-v3/include/parallel/base.h
@@ -287,8 +287,8 @@ struct less<_Tp, _Tp> : public std::binary_function<_Tp, _Tp, bool>
 template<typename _Tp1, typename _Tp2>
   struct plus : public std::binary_function<_Tp1, _Tp2, _Tp1>
   {
-    typedef typeof(*static_cast<_Tp1*>(NULL)
-                    + *static_cast<_Tp2*>(NULL)) result;
+    typedef __typeof__(*static_cast<_Tp1*>(NULL)
+                      + *static_cast<_Tp2*>(NULL)) result;
 
     result
     operator()(const _Tp1& __x, const _Tp2& __y) const
@@ -299,8 +299,8 @@ template<typename _Tp1, typename _Tp2>
 template<typename _Tp>
   struct plus<_Tp, _Tp> : public std::binary_function<_Tp, _Tp, _Tp>
   {
-    typedef typeof(*static_cast<_Tp*>(NULL)
-                    + *static_cast<_Tp*>(NULL)) result;
+    typedef __typeof__(*static_cast<_Tp*>(NULL)
+                      + *static_cast<_Tp*>(NULL)) result;
 
     result
     operator()(const _Tp& __x, const _Tp& __y) const
@@ -312,8 +312,8 @@ template<typename _Tp>
 template<typename _Tp1, typename _Tp2>
   struct multiplies : public std::binary_function<_Tp1, _Tp2, _Tp1>
   {
-    typedef typeof(*static_cast<_Tp1*>(NULL)
-                    * *static_cast<_Tp2*>(NULL)) result;
+    typedef __typeof__(*static_cast<_Tp1*>(NULL)
+                      * *static_cast<_Tp2*>(NULL)) result;
 
     result
     operator()(const _Tp1& __x, const _Tp2& __y) const
@@ -324,8 +324,8 @@ template<typename _Tp1, typename _Tp2>
 template<typename _Tp>
   struct multiplies<_Tp, _Tp> : public std::binary_function<_Tp, _Tp, _Tp>
   {
-    typedef typeof(*static_cast<_Tp*>(NULL)
-                    * *static_cast<_Tp*>(NULL)) result;
+    typedef __typeof__(*static_cast<_Tp*>(NULL)
+                      * *static_cast<_Tp*>(NULL)) result;
 
     result
     operator()(const _Tp& __x, const _Tp& __y) const