diff options
| author | singler <singler@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-26 09:18:48 +0000 |
|---|---|---|
| committer | singler <singler@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-01-26 09:18:48 +0000 |
| commit | 49edb39c74b93a0122f83f8bff71a0c2d2654fa1 (patch) | |
| tree | 7b9ee2bee4f87566cbb90b64e074cf85209740bb /libstdc++-v3/include/parallel/numeric | |
| parent | 6a3b1a0da6838e5c31879e28c0475b67be6a468d (diff) | |
| download | ppe42-gcc-49edb39c74b93a0122f83f8bff71a0c2d2654fa1.tar.gz ppe42-gcc-49edb39c74b93a0122f83f8bff71a0c2d2654fa1.zip | |
2011-01-26 Johannes Singler <singler@kit.edu>
* include/parallel/numeric (inner_product, partial_sum):
Qualify subsequent call with __gnu_parallel instead of
_GLIBCXX_STD_P to reenable parallel execution without ambiguity.
* include/parallel/algobase.h (equal): Likewise.
* include/parallel/algo.h (find_first_of, search_n, merge,
nth_element, partial_sort, max_element, min_element): Likewise.
* testsuite/25_algorithms/headers/algorithm/
parallel_algorithm_mixed1.cc (main): Add respective test cases.
* testsuite/25_algorithms/headers/algorithm/
parallel_algorithm_mixed2.cc (main): Likewise.
* testsuite/26_numerics/headers/numeric/
parallel_numeric_mixed1.cc (main): Likewise.
* testsuite/26_numerics/headers/numeric/
parallel_numeric_mixed2.cc (main): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169280 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/parallel/numeric')
| -rw-r--r-- | libstdc++-v3/include/parallel/numeric | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric index fb1fce257c4..b779aae8d6d 100644 --- a/libstdc++-v3/include/parallel/numeric +++ b/libstdc++-v3/include/parallel/numeric @@ -283,7 +283,7 @@ namespace __parallel typedef typename __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::result_type _MultipliesResultType; - return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init, + return __gnu_parallel::inner_product(__first1, __last1, __first2, __init, __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(), __gnu_parallel:: _Multiplies<_ValueType1, _ValueType2>(), @@ -303,7 +303,7 @@ namespace __parallel typedef typename __gnu_parallel::_Multiplies<_ValueType1, _ValueType2>::result_type _MultipliesResultType; - return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init, + return __gnu_parallel::inner_product(__first1, __last1, __first2, __init, __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(), __gnu_parallel:: _Multiplies<_ValueType1, _ValueType2>()); @@ -359,7 +359,7 @@ namespace __parallel partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result) { typedef typename iterator_traits<_IIter>::value_type _ValueType; - return _GLIBCXX_STD_P::partial_sum(__begin, __end, + return __gnu_parallel::partial_sum(__begin, __end, __result, std::plus<_ValueType>()); } |
