diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-03-22 12:18:46 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-03-22 12:18:46 +0000 |
| commit | 2305a1e82e8bd6498fd2c01ffb71ba597e218d0a (patch) | |
| tree | f0e4822f6f1f41d71ebb9b4543cd32fa04743624 /libstdc++-v3/include/parallel/numeric | |
| parent | be36dd859d8f539adea5968c6423b6d062700038 (diff) | |
| download | gcc-2305a1e82e8bd6498fd2c01ffb71ba597e218d0a.tar.gz | |
base.h (_Less): Use std::less.
2010-03-22 Paolo Carlini <paolo.carlini@oracle.com>
* include/parallel/base.h (_Less): Use std::less.
(_Plus): Likewise use std::plus.
(_Multiplies): Likewise use std::multiplies.
* include/parallel/numeric: Adjust.
From-SVN: r157622
Diffstat (limited to 'libstdc++-v3/include/parallel/numeric')
| -rw-r--r-- | libstdc++-v3/include/parallel/numeric | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric index eff597ea70a..76916ff3ecb 100644 --- a/libstdc++-v3/include/parallel/numeric +++ b/libstdc++-v3/include/parallel/numeric @@ -281,7 +281,7 @@ namespace __parallel typedef typename _TraitsType2::value_type _ValueType2; typedef typename - __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::__result + __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::result_type _MultipliesResultType; return inner_product(__first1, __last1, __first2, __init, __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(), @@ -301,7 +301,7 @@ namespace __parallel typedef typename _TraitsType2::value_type _ValueType2; typedef typename - __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::__result + __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::result_type _MultipliesResultType; return inner_product(__first1, __last1, __first2, __init, __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(), |