diff options
| author | Johannes Singler <singler@kit.edu> | 2010-03-22 17:06:50 +0000 |
|---|---|---|
| committer | Johannes Singler <singler@gcc.gnu.org> | 2010-03-22 17:06:50 +0000 |
| commit | 0e50f3350ef468be6f1552f856fd8b313baaf933 (patch) | |
| tree | ae4ed1d607f661d9a31336077ca79200f24cde25 /libstdc++-v3/include/parallel/partial_sum.h | |
| parent | 047550e9f62c57511d6e88da4e4f4f8031929b2e (diff) | |
| download | gcc-0e50f3350ef468be6f1552f856fd8b313baaf933.tar.gz | |
numeric (inner_product, [...]): Precede subsequent call with _GLIBCXX_STD_P:: to avoid ambiguity between...
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::.
From-SVN: r157643
Diffstat (limited to 'libstdc++-v3/include/parallel/partial_sum.h')
| -rw-r--r-- | libstdc++-v3/include/parallel/partial_sum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/include/parallel/partial_sum.h b/libstdc++-v3/include/parallel/partial_sum.h index 487fd6dd666..966d9db0572 100644 --- a/libstdc++-v3/include/parallel/partial_sum.h +++ b/libstdc++-v3/include/parallel/partial_sum.h @@ -158,7 +158,8 @@ namespace __gnu_parallel else { ::new(&(__sums[__iam])) - _ValueType(std::accumulate(__begin + __borders[__iam] + 1, + _ValueType(__gnu_parallel::accumulate( + __begin + __borders[__iam] + 1, __begin + __borders[__iam + 1], *(__begin + __borders[__iam]), __bin_op, |