diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 11 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/algo.h | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/for_each.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/numeric | 19 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/omp_loop.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/omp_loop_static.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/par_loop.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/workstealing.h | 2 |
8 files changed, 31 insertions, 21 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cf4cb71..3fa14ac 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,16 @@ 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 parameter to the end as of others. * include/parallel/algobase.h diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h index ec632b4..8d685b5 100644 --- 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 f1c9c23..b585999 100644 --- 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 de53f49..06985ba 100644 --- 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 1c91be1..2424bfb 100644 --- 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 00516bf..3d9ed84 100644 --- 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 d5e00af..c842364 100644 --- 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 66c2bab..638057c 100644 --- 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) |