Commit 78605f0a by Johannes Singler Committed by Johannes Singler

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
parent 2a2e7f9d
2009-09-24 Johannes Singler <singler@ira.uka.de> 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 * include/parallel/base.h (_EqualFromLess): Move _Compare template
parameter to the end as of others. parameter to the end as of others.
* include/parallel/algobase.h * include/parallel/algobase.h
......
...@@ -1228,12 +1228,12 @@ namespace __parallel ...@@ -1228,12 +1228,12 @@ namespace __parallel
bool __dummy = true; bool __dummy = true;
typedef __gnu_parallel::_IteratorPair<_RAIter1, typedef __gnu_parallel::_IteratorPair<_RAIter1,
_RAIter2, random_access_iterator_tag> _ItTrip; _RAIter2, random_access_iterator_tag> _ItTrip;
_ItTrip begin_pair(__begin, __result), _ItTrip __begin_pair(__begin, __result),
end_pair(__end, __result + (__end - __begin)); __end_pair(__end, __result + (__end - __begin));
__gnu_parallel::__transform1_selector<_ItTrip> __functionality; __gnu_parallel::__transform1_selector<_ItTrip> __functionality;
__gnu_parallel:: __gnu_parallel::
__for_each_template_random_access( __for_each_template_random_access(
begin_pair, end_pair, __unary_op, __functionality, __begin_pair, __end_pair, __unary_op, __functionality,
__gnu_parallel::_DummyReduct(), __gnu_parallel::_DummyReduct(),
__dummy, __dummy, -1, __parallelism_tag); __dummy, __dummy, -1, __parallelism_tag);
return __functionality._M_finish_iterator; return __functionality._M_finish_iterator;
......
...@@ -69,26 +69,26 @@ namespace __gnu_parallel ...@@ -69,26 +69,26 @@ namespace __gnu_parallel
_Parallelism __parallelism_tag) _Parallelism __parallelism_tag)
{ {
if (__parallelism_tag == parallel_unbalanced) 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, __functionality, __reduction,
__reduction_start, __reduction_start,
__output, __bound); __output, __bound);
else if (__parallelism_tag == parallel_omp_loop) 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, __begin, __end, __user_op,
__functionality, __functionality,
__reduction, __reduction,
__reduction_start, __reduction_start,
__output, __bound); __output, __bound);
else if (__parallelism_tag == parallel_omp_loop_static) 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, __begin, __end, __user_op,
__functionality, __functionality,
__reduction, __reduction,
__reduction_start, __reduction_start,
__output, __bound); __output, __bound);
else //e. g. parallel_balanced 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, __user_op,
__functionality, __functionality,
__reduction, __reduction,
......
...@@ -98,7 +98,7 @@ __gnu_parallel::sequential_tag()); } ...@@ -98,7 +98,7 @@ __gnu_parallel::sequential_tag()); }
__gnu_parallel::__accumulate_selector<__RAIter> __gnu_parallel::__accumulate_selector<__RAIter>
__my_selector; __my_selector;
__gnu_parallel:: __gnu_parallel::
for_each_template_random_access_ed(__begin, __end, __for_each_template_random_access_ed(__begin, __end,
__gnu_parallel::_Nothing(), __gnu_parallel::_Nothing(),
__my_selector, __my_selector,
__gnu_parallel:: __gnu_parallel::
...@@ -208,9 +208,9 @@ __gnu_parallel::sequential_tag()); } ...@@ -208,9 +208,9 @@ __gnu_parallel::sequential_tag()); }
__inner_product_selector<_RAIter1, __inner_product_selector<_RAIter1,
_RAIter2, _Tp> __my_selector(__first1, __first2); _RAIter2, _Tp> __my_selector(__first1, __first2);
__gnu_parallel:: __gnu_parallel::
for_each_template_random_access_ed(__first1, __last1, __binary_op2, __for_each_template_random_access_ed(
__my_selector, __binary_op1, __first1, __last1, __binary_op2, __my_selector, __binary_op1,
__res, __res, -1); __res, __res, -1);
return __res; return __res;
} }
else else
...@@ -427,15 +427,14 @@ __gnu_parallel::sequential_tag()); } ...@@ -427,15 +427,14 @@ __gnu_parallel::sequential_tag()); }
typedef __gnu_parallel::_IteratorPair<_IIter, _OutputIterator, typedef __gnu_parallel::_IteratorPair<_IIter, _OutputIterator,
random_access_iterator_tag> _ItTrip; random_access_iterator_tag> _ItTrip;
*__result = *__begin; *__result = *__begin;
_ItTrip begin_pair(__begin + 1, __result + 1), _ItTrip __begin_pair(__begin + 1, __result + 1),
end_pair(__end, __result + (__end - __begin)); __end_pair(__end, __result + (__end - __begin));
__gnu_parallel::__adjacent_difference_selector<_ItTrip> __gnu_parallel::__adjacent_difference_selector<_ItTrip>
__functionality; __functionality;
__gnu_parallel:: __gnu_parallel::
for_each_template_random_access_ed(begin_pair, end_pair, __bin_op, __for_each_template_random_access_ed(
__functionality, __begin_pair, __end_pair, __bin_op, __functionality,
__gnu_parallel::_DummyReduct(), __gnu_parallel::_DummyReduct(), __dummy, __dummy, -1);
__dummy, __dummy, -1);
return __functionality.finish_iterator; return __functionality.finish_iterator;
} }
else else
......
...@@ -64,7 +64,7 @@ template<typename _RAIter, ...@@ -64,7 +64,7 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _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, _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
_Result __base, _Result& __output, _Result __base, _Result& __output,
typename std::iterator_traits<_RAIter>::difference_type __bound) typename std::iterator_traits<_RAIter>::difference_type __bound)
......
...@@ -64,7 +64,7 @@ template<typename _RAIter, ...@@ -64,7 +64,7 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _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, _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
_Result __base, _Result& __output, _Result __base, _Result& __output,
typename std::iterator_traits<_RAIter>::difference_type __bound) typename std::iterator_traits<_RAIter>::difference_type __bound)
......
...@@ -65,7 +65,7 @@ template<typename _RAIter, ...@@ -65,7 +65,7 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _Op
for_each_template_random_access_ed( __for_each_template_random_access_ed(
_RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r, _RAIter __begin, _RAIter __end, _Op __o, _Fu& __f, _Red __r,
_Result __base, _Result& __output, _Result __base, _Result& __output,
typename std::iterator_traits<_RAIter>::difference_type __bound) typename std::iterator_traits<_RAIter>::difference_type __bound)
......
...@@ -96,7 +96,7 @@ template<typename _RAIter, ...@@ -96,7 +96,7 @@ template<typename _RAIter,
typename _Red, typename _Red,
typename _Result> typename _Result>
_Op _Op
for_each_template_random_access_workstealing( __for_each_template_random_access_workstealing(
_RAIter __begin, _RAIter __end, _Op __op, _Fu& __f, _Red __r, _RAIter __begin, _RAIter __end, _Op __op, _Fu& __f, _Red __r,
_Result __base, _Result& __output, _Result __base, _Result& __output,
typename std::iterator_traits<_RAIter>::difference_type __bound) typename std::iterator_traits<_RAIter>::difference_type __bound)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment