diff options
| author | singler <singler@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-22 17:06:50 +0000 |
|---|---|---|
| committer | singler <singler@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-22 17:06:50 +0000 |
| commit | ab672a7f07a2caada1a2e0ffa12c0c66a3fb0d6f (patch) | |
| tree | ae4ed1d607f661d9a31336077ca79200f24cde25 /libstdc++-v3/include/parallel/numeric | |
| parent | 70bb3c914b2caa213e1063a8a0960efca9593f88 (diff) | |
| download | ppe42-gcc-ab672a7f07a2caada1a2e0ffa12c0c66a3fb0d6f.tar.gz ppe42-gcc-ab672a7f07a2caada1a2e0ffa12c0c66a3fb0d6f.zip | |
2010-03-22 Johannes Singler <singler@kit.edu>
* include/parallel/numeric (inner_product, partial_sum):
Precede subsequent call with _GLIBCXX_STD_P:: to avoid ambiguity
between __gnu_parallel:: and std::
* 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.
* include/parallel/partial_sum.h (__parallel_partial_sum_linear):
Qualify accumulate call with __gnu_parallel::.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157643 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/parallel/numeric')
| -rw-r--r-- | libstdc++-v3/include/parallel/numeric | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric index 76916ff3ecb..7ba44d21e33 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 inner_product(__first1, __last1, __first2, __init, + return _GLIBCXX_STD_P::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 inner_product(__first1, __last1, __first2, __init, + return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init, __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(), __gnu_parallel:: _Multiplies<_ValueType1, _ValueType2>()); @@ -359,7 +359,8 @@ namespace __parallel partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result) { typedef typename iterator_traits<_IIter>::value_type _ValueType; - return partial_sum(__begin, __end, __result, std::plus<_ValueType>()); + return _GLIBCXX_STD_P::partial_sum(__begin, __end, + __result, std::plus<_ValueType>()); } // Public interface |
