algo.h: Uglify internal identifiers; correct line breaks.

2009-09-24  Johannes Singler  <singler@ira.uka.de>

        * include/parallel/algo.h: Uglify internal identifiers;
        correct line breaks.
        * include/parallel/for_each.h: Likewise.
        * include/parallel/numeric: Likewise.
        * include/parallel/omp_loop.h: Likewise.
        * include/parallel/omp_loop_static.h: Likewise.
        * include/parallel/par_loop.h: Likewise.
        * include/parallel/workstealing.h: Likewise.

From-SVN: r152113

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cf4cb7148b32959d4feb7dcaef29f573741b8269..3fa14ac08decfc438756d721d25f5cf566c6eb5f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-24  Johannes Singler  <singler@ira.uka.de>
+
+        * include/parallel/algo.h: Uglify internal identifiers;
+        correct line breaks.
+        * include/parallel/for_each.h: Likewise.
+        * include/parallel/numeric: Likewise.
+        * include/parallel/omp_loop.h: Likewise.
+        * include/parallel/omp_loop_static.h: Likewise.
+        * include/parallel/par_loop.h: Likewise.
+        * include/parallel/workstealing.h: Likewise.
+
 2009-09-24  Johannes Singler  <singler@ira.uka.de>
 
         * include/parallel/base.h (_EqualFromLess):  Move _Compare template

diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h
index ec632b496b8a91fab588ac86b6c05ba7b5f8c15a..8d685b5c946452840afbbc742f4d89ba655f8de4 100644 (file)
--- a/libstdc++-v3/include/parallel/algo.h
+++ b/libstdc++-v3/include/parallel/algo.h
@@ -1228,12 +1228,12 @@ namespace __parallel
           bool __dummy = true;
           typedef __gnu_parallel::_IteratorPair<_RAIter1,
             _RAIter2, random_access_iterator_tag> _ItTrip;
-          _ItTrip begin_pair(__begin, __result),
-                  end_pair(__end, __result + (__end - __begin));
+          _ItTrip __begin_pair(__begin, __result),
+                  __end_pair(__end, __result + (__end - __begin));
           __gnu_parallel::__transform1_selector<_ItTrip> __functionality;
           __gnu_parallel::
             __for_each_template_random_access(
-              begin_pair, end_pair, __unary_op, __functionality,
+              __begin_pair, __end_pair, __unary_op, __functionality,
               __gnu_parallel::_DummyReduct(),
               __dummy, __dummy, -1, __parallelism_tag);
           return __functionality._M_finish_iterator;

diff --git a/libstdc++-v3/include/parallel/for_each.h b/libstdc++-v3/include/parallel/for_each.h
index f1c9c23b8a5520b5c86a1ad9bffda4ce197bbf9a..b585999f51431f75a9c5e50a8b3943ba3de9b835 100644 (file)
--- a/libstdc++-v3/include/parallel/for_each.h
+++ b/libstdc++-v3/include/parallel/for_each.h
@@ -69,26 +69,26 @@ namespace __gnu_parallel
                                       _Parallelism __parallelism_tag)
     {
       if (__parallelism_tag == parallel_unbalanced)
-        return for_each_template_random_access_ed(__begin, __end, __user_op,
+        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(
+        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(
+        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,
+        return __for_each_template_random_access_workstealing(__begin, __end,
                                                             __user_op,
                                                             __functionality,
                                                             __reduction,

diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric
index de53f49e9f009427501aaf4910d36f6e80d1210f..06985ba99c93ad144d1adc1ae9a91b703a24a6c4 100644 (file)
--- a/libstdc++-v3/include/parallel/numeric
+++ b/libstdc++-v3/include/parallel/numeric
@@ -98,7 +98,7 @@ __gnu_parallel::sequential_tag()); }
           __gnu_parallel::__accumulate_selector<__RAIter>
             __my_selector;
           __gnu_parallel::
-            for_each_template_random_access_ed(__begin, __end,
+            __for_each_template_random_access_ed(__begin, __end,
                                             __gnu_parallel::_Nothing(),
                                             __my_selector,
                                             __gnu_parallel::
@@ -208,9 +208,9 @@ __gnu_parallel::sequential_tag()); }
             __inner_product_selector<_RAIter1,
             _RAIter2, _Tp> __my_selector(__first1, __first2);
           __gnu_parallel::
-            for_each_template_random_access_ed(__first1, __last1, __binary_op2,
-                                            __my_selector, __binary_op1,
-                                            __res, __res, -1);
+            __for_each_template_random_access_ed(
+                __first1, __last1, __binary_op2, __my_selector, __binary_op1,
+                __res, __res, -1);
           return __res;
         }
       else
@@ -427,15 +427,14 @@ __gnu_parallel::sequential_tag()); }
           typedef __gnu_parallel::_IteratorPair<_IIter, _OutputIterator,
             random_access_iterator_tag> _ItTrip;
           *__result = *__begin;
-          _ItTrip begin_pair(__begin + 1, __result + 1),
-            end_pair(__end, __result + (__end - __begin));
+          _ItTrip __begin_pair(__begin + 1, __result + 1),
+            __end_pair(__end, __result + (__end - __begin));
           __gnu_parallel::__adjacent_difference_selector<_ItTrip>
                                                             __functionality;
           __gnu_parallel::
-            for_each_template_random_access_ed(begin_pair, end_pair, __bin_op,
-                                            __functionality,
-                                            __gnu_parallel::_DummyReduct(),
-                                            __dummy, __dummy, -1);
+            __for_each_template_random_access_ed(
+                __begin_pair, __end_pair, __bin_op, __functionality,
+                __gnu_parallel::_DummyReduct(), __dummy, __dummy, -1);
           return __functionality.finish_iterator;
         }
       else

diff --git a/libstdc++-v3/include/parallel/omp_loop.h b/libstdc++-v3/include/parallel/omp_loop.h
index 1c91be1ae4d038a3b73d4cec8a37707139b98aa8..2424bfbdde87c8808e63063092e1caedbe8434d2 100644 (file)
--- a/libstdc++-v3/include/parallel/omp_loop.h
+++ b/libstdc++-v3/include/parallel/omp_loop.h
@@ -64,7 +64,7 @@ template<typename _RAIter,
          typename _Red,
          typename _Result>
   _Op
-  for_each_template_random_access_omp_loop(
+  __for_each_template_random_access_omp_loop(
     _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
     _Result __base, _Result& __output,
     typename std::iterator_traits<_RAIter>::difference_type __bound)

diff --git a/libstdc++-v3/include/parallel/omp_loop_static.h b/libstdc++-v3/include/parallel/omp_loop_static.h
index 00516bfb1db852578d4edf9eefd3685948cff15d..3d9ed841ac62be97c3158e296d9025d9c7aba917 100644 (file)
--- a/libstdc++-v3/include/parallel/omp_loop_static.h
+++ b/libstdc++-v3/include/parallel/omp_loop_static.h
@@ -64,7 +64,7 @@ template<typename _RAIter,
          typename _Red,
          typename _Result>
   _Op
-  for_each_template_random_access_omp_loop_static(
+  __for_each_template_random_access_omp_loop_static(
     _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
     _Result __base, _Result& __output,
     typename std::iterator_traits<_RAIter>::difference_type __bound)

diff --git a/libstdc++-v3/include/parallel/par_loop.h b/libstdc++-v3/include/parallel/par_loop.h
index d5e00affbe9c4e35c0dbd60922d7a1dc92c33524..c842364a6fd2eac3e5934cbd283088bff728fa88 100644 (file)
--- a/libstdc++-v3/include/parallel/par_loop.h
+++ b/libstdc++-v3/include/parallel/par_loop.h
@@ -65,7 +65,7 @@ template<typename _RAIter,
          typename _Red,
          typename _Result>
   _Op
-  for_each_template_random_access_ed(
+  __for_each_template_random_access_ed(
     _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
     _Result __base, _Result& __output,
     typename std::iterator_traits<_RAIter>::difference_type __bound)

diff --git a/libstdc++-v3/include/parallel/workstealing.h b/libstdc++-v3/include/parallel/workstealing.h
index 66c2babf269c9f0833f0f5f00286f03a48599d5f..638057ca7409c456373f9a789ec62973fca2ebb8 100644 (file)
--- a/libstdc++-v3/include/parallel/workstealing.h
+++ b/libstdc++-v3/include/parallel/workstealing.h
@@ -96,7 +96,7 @@ template<typename _RAIter,
          typename _Red,
          typename _Result>
   _Op
-  for_each_template_random_access_workstealing(
+  __for_each_template_random_access_workstealing(
     _RAIter __begin, _RAIter __end, _Op __op, _Fu& __f, _Red __r,
     _Result __base, _Result& __output,
     typename std::iterator_traits<_RAIter>::difference_type __bound)