diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-06-26 10:45:31 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-06-26 10:45:31 +0000 |
| commit | 2dcc0099c86b043b27d14d173d7b0f5db04620e7 (patch) | |
| tree | 6b679cc04f6154c8816f1046e297464799060d20 | |
| parent | b4b010ad85aef0090fce80cb646da96a067598f2 (diff) | |
| download | gcc-2dcc0099c86b043b27d14d173d7b0f5db04620e7.zip gcc-2dcc0099c86b043b27d14d173d7b0f5db04620e7.tar.gz gcc-2dcc0099c86b043b27d14d173d7b0f5db04620e7.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/base.h | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 78c000f..b159b9e 100644 --- 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 b713ee7..54c26d8 100644 --- 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 |