2012-05-02 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / parallel / for_each.h

diff --git a/libstdc++-v3/include/parallel/for_each.h b/libstdc++-v3/include/parallel/for_each.h
index 61158f8..0132593 100644 (file)
--- a/libstdc++-v3/include/parallel/for_each.h
+++ b/libstdc++-v3/include/parallel/for_each.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the terms
@@ -42,55 +42,48 @@
 
 namespace __gnu_parallel
 {
-  /** @brief Chose the desired algorithm by evaluating @c parallelism_tag.
-   *  @param begin Begin iterator of input sequence.
-   *  @param end End iterator of input sequence.
-   *  @param user_op A user-specified functor (comparator, predicate,
+  /** @brief Chose the desired algorithm by evaluating @c __parallelism_tag.
+   *  @param __begin Begin iterator of input sequence.
+   *  @param __end End iterator of input sequence.
+   *  @param __user_op A user-specified functor (comparator, predicate,
    *  associative operator,...)
-   *  @param functionality functor to "process" an element with
-   *  user_op (depends on desired functionality, e. g. accumulate,
+   *  @param __functionality functor to @a process an element with
+   *  __user_op (depends on desired functionality, e. g. accumulate,
    *  for_each,...
-   *  @param reduction Reduction functor.
-   *  @param reduction_start Initial value for reduction.
-   *  @param output Output iterator.
-   *  @param bound Maximum number of elements processed.
-   *  @param parallelism_tag Parallelization method */
-  template<typename InputIterator, typename UserOp,
-          typename Functionality, typename Red, typename Result>
-    UserOp
-    for_each_template_random_access(InputIterator begin, InputIterator end,
-                                   UserOp user_op,
-                                   Functionality& functionality,
-                                   Red reduction, Result reduction_start,
-                                   Result& output, typename
-                                   std::iterator_traits<InputIterator>::
-                                   difference_type bound,
-                                   _Parallelism parallelism_tag)
+   *  @param __reduction Reduction functor.
+   *  @param __reduction_start Initial value for reduction.
+   *  @param __output Output iterator.
+   *  @param __bound Maximum number of elements processed.
+   *  @param __parallelism_tag Parallelization method */
+  template<typename _IIter, typename _UserOp,
+           typename _Functionality, typename _Red, typename _Result>
+    _UserOp
+    __for_each_template_random_access(_IIter __begin, _IIter __end,
+                                      _UserOp __user_op,
+                                      _Functionality& __functionality,
+                                      _Red __reduction,
+                                      _Result __reduction_start,
+                                      _Result& __output, typename
+                                      std::iterator_traits<_IIter>::
+                                      difference_type __bound,
+                                      _Parallelism __parallelism_tag)
     {
-      if (parallelism_tag == parallel_unbalanced)
-       return for_each_template_random_access_ed(begin, end, user_op,
-                                                 functionality, reduction,
-                                                 reduction_start,
-                                                 output, bound);
-      else if (parallelism_tag == parallel_omp_loop)
-       return for_each_template_random_access_omp_loop(begin, end, user_op,
-                                                       functionality,
-                                                       reduction,
-                                                       reduction_start,
-                                                       output, bound);
-      else if (parallelism_tag == parallel_omp_loop_static)
-       return for_each_template_random_access_omp_loop(begin, end, user_op,
-                                                       functionality,
-                                                       reduction,
-                                                       reduction_start,
-                                                       output, bound);
-      else     //e. g. parallel_balanced
-       return for_each_template_random_access_workstealing(begin, end,
-                                                           user_op,
-                                                           functionality,
-                                                           reduction,
-                                                           reduction_start,
-                                                           output, bound);
+      if (__parallelism_tag == parallel_unbalanced)
+        return __for_each_template_random_access_ed
+         (__begin, __end, __user_op, __functionality, __reduction,
+          __reduction_start, __output, __bound);
+      else if (__parallelism_tag == parallel_omp_loop)
+        return __for_each_template_random_access_omp_loop
+         (__begin, __end, __user_op, __functionality, __reduction,
+          __reduction_start, __output, __bound);
+      else if (__parallelism_tag == parallel_omp_loop_static)
+        return __for_each_template_random_access_omp_loop
+         (__begin, __end, __user_op, __functionality, __reduction,
+          __reduction_start, __output, __bound);
+      else      //e. g. parallel_balanced
+        return __for_each_template_random_access_workstealing
+         (__begin, __end, __user_op, __functionality, __reduction,
+          __reduction_start, __output, __bound);
   }
 }