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/branches/gcc-4_4-branch@157644 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 19 insertions, 14 deletions

diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h
index a0fbd8d91d6..beb5035b2be 100644
--- a/libstdc++-v3/include/parallel/algo.h
+++ b/libstdc++-v3/include/parallel/algo.h
@@ -289,8 +289,8 @@ namespace __parallel
       typedef typename iteratori_traits::value_type valuei_type;
       typedef typename iteratorf_traits::value_type valuef_type;
 
-      return find_first_of(begin1, end1, begin2, end2, __gnu_parallel::
-                           equal_to<valuei_type, valuef_type>());
+      return _GLIBCXX_STD_P::find_first_of(begin1, end1, begin2, end2,
+                __gnu_parallel::equal_to<valuei_type, valuef_type>());
     }
 
   // Sequential fallback
@@ -1152,7 +1152,7 @@ namespace __parallel
              const T& val)
     {
       typedef typename iterator_traits<ForwardIterator>::value_type value_type;
-      return search_n(begin, end, count, val,
+      return _GLIBCXX_STD_P::search_n(begin, end, count, val,
                       __gnu_parallel::equal_to<value_type, T>());
     }
 
@@ -2093,7 +2093,7 @@ namespace __parallel
       typedef typename iterator1_traits::value_type value1_type;
       typedef typename iterator2_traits::value_type value2_type;
 
-      return merge(begin1, end1, begin2, end2, result, 
+      return _GLIBCXX_STD_P::merge(begin1, end1, begin2, end2, result, 
                    __gnu_parallel::less<value1_type, value2_type>());
     }
 
@@ -2134,7 +2134,7 @@ namespace __parallel
     {
       typedef iterator_traits<RandomAccessIterator> traits_type;
       typedef typename traits_type::value_type value_type;
-      nth_element(begin, nth, end, std::less<value_type>());
+      _GLIBCXX_STD_P::nth_element(begin, nth, end, std::less<value_type>());
     }
 
   // Sequential fallback
@@ -2175,7 +2175,8 @@ namespace __parallel
     {
       typedef iterator_traits<RandomAccessIterator> traits_type;
       typedef typename traits_type::value_type value_type;
-      partial_sort(begin, middle, end, std::less<value_type>());
+      _GLIBCXX_STD_P::partial_sort(begin, middle, end,
+                                   std::less<value_type>());
     }
 
   // Sequential fallback
@@ -2244,7 +2245,7 @@ namespace __parallel
     max_element(ForwardIterator begin, ForwardIterator end)
     {
       typedef typename iterator_traits<ForwardIterator>::value_type value_type;
-      return max_element(begin, end, std::less<value_type>());
+      return _GLIBCXX_STD_P::max_element(begin, end, std::less<value_type>());
     }
 
   // Public interface
@@ -2335,7 +2336,7 @@ namespace __parallel
     min_element(ForwardIterator begin, ForwardIterator end)
     {
       typedef typename iterator_traits<ForwardIterator>::value_type value_type;
-      return min_element(begin, end, std::less<value_type>());
+      return _GLIBCXX_STD_P::min_element(begin, end, std::less<value_type>());
     }
 
   // Public interface
diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h
index aaffb3e5f3b..6a79ee052ef 100644
--- a/libstdc++-v3/include/parallel/algobase.h
+++ b/libstdc++-v3/include/parallel/algobase.h
@@ -146,7 +146,7 @@ namespace __parallel
   template<typename InputIterator1, typename InputIterator2>
     inline bool
     equal(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2)
-    { return mismatch(begin1, end1, begin2).first == end1; }
+    { return _GLIBCXX_STD_P::mismatch(begin1, end1, begin2).first == end1; }
 
   // Public interface
   template<typename InputIterator1, typename InputIterator2,
@@ -154,7 +154,10 @@ namespace __parallel
     inline bool
     equal(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2, 
 	  Predicate pred)
-    { return mismatch(begin1, end1, begin2, pred).first == end1; }
+    {
+      return _GLIBCXX_STD_P::mismatch(begin1, end1, begin2, pred).first
+                  == end1;
+    }
 
   // Sequential fallback
   template<typename InputIterator1, typename InputIterator2>
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric
index 33b1411f1b0..3a3e0fe5a08 100644
--- a/libstdc++-v3/include/parallel/numeric
+++ b/libstdc++-v3/include/parallel/numeric
@@ -280,7 +280,7 @@ namespace __parallel
       typedef typename
 	__gnu_parallel::multiplies<value_type1, value_type2>::result
         multiplies_result_type;
-      return inner_product(first1, last1, first2, init,
+      return _GLIBCXX_STD_P::inner_product(first1, last1, first2, init,
                            __gnu_parallel::plus<T, multiplies_result_type>(),
                            __gnu_parallel::
 			   multiplies<value_type1, value_type2>(),
@@ -300,7 +300,7 @@ namespace __parallel
       typedef typename
 	__gnu_parallel::multiplies<value_type1, value_type2>::result
         multiplies_result_type;
-      return inner_product(first1, last1, first2, init,
+      return _GLIBCXX_STD_P::inner_product(first1, last1, first2, init,
                            __gnu_parallel::plus<T, multiplies_result_type>(),
                            __gnu_parallel::
 			   multiplies<value_type1, value_type2>());
@@ -355,7 +355,8 @@ namespace __parallel
     partial_sum(InputIterator begin, InputIterator end, OutputIterator result)
     {
       typedef typename iterator_traits<InputIterator>::value_type value_type;
-      return partial_sum(begin, end, result, std::plus<value_type>());
+      return _GLIBCXX_STD_P::partial_sum(begin, end, result,
+                                         std::plus<value_type>());
     }
 
   // Public interface
diff --git a/libstdc++-v3/include/parallel/partial_sum.h b/libstdc++-v3/include/parallel/partial_sum.h
index 92630936d3f..6fce386eb10 100644
--- a/libstdc++-v3/include/parallel/partial_sum.h
+++ b/libstdc++-v3/include/parallel/partial_sum.h
@@ -155,7 +155,7 @@ template<typename InputIterator,
         else
           {
             ::new(&(sums[iam]))
-	      value_type(std::accumulate(begin + borders[iam] + 1,
+	      value_type(__gnu_parallel::accumulate(begin + borders[iam] + 1,
 					 begin + borders[iam + 1],
 					 *(begin + borders[iam]),
 					 bin_op,