diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-22 12:18:46 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-22 12:18:46 +0000 |
| commit | 42b6f54ddd730501ec19b0f4fa1fa049f49ae99c (patch) | |
| tree | f0e4822f6f1f41d71ebb9b4543cd32fa04743624 /libstdc++-v3/include/parallel/numeric | |
| parent | 103d49ba7cd343f9d482c78b08ac06c645608549 (diff) | |
| download | ppe42-gcc-42b6f54ddd730501ec19b0f4fa1fa049f49ae99c.tar.gz ppe42-gcc-42b6f54ddd730501ec19b0f4fa1fa049f49ae99c.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157622 138bc75d-0d04-0410-961f-82ee72b054a4
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>(), |
