Re: [patch, 4.9] backport parallel header changes to the 4.9 branch

[Jonathan Wakely]

On 02/12/14 17:20 +0100, Matthias Klose wrote:
Backport these header changes to the 4.9 branch. No regression, but 
reported to the Debian BTS.  Safe to backport according to Jonathan 
Wakely. No regressions in the testsuite on x86_64-linux-gnu. Ok for 
the branch?


You might as well include the additional fixes in r217069 which fix
more instances of the same problem.

Re: [patch, 4.9] backport parallel header changes to the 4.9 branch

[Jonathan Wakely]

On 02/12/14 16:24 +, Jonathan Wakely wrote:

On 02/12/14 17:20 +0100, Matthias Klose wrote:
Backport these header changes to the 4.9 branch. No regression, but 
reported to the Debian BTS.  Safe to backport according to Jonathan 
Wakely. No regressions in the testsuite on x86_64-linux-gnu. Ok for 
the branch?


You might as well include the additional fixes in r217069 which fix
more instances of the same problem.


Which you already did! Sorry.

OK for the 4.9 branch, thanks for doing this.

[patch, 4.9] backport parallel header changes to the 4.9 branch

[Matthias Klose]

Backport these header changes to the 4.9 branch. No regression, but reported to 
the Debian BTS.  Safe to backport according to Jonathan Wakely. No regressions 
in the testsuite on x86_64-linux-gnu. Ok for the branch?


libstdc++-v3/

2014-12-02  Matthias Klose  

PR libstdc++/64103
Backport from mainline
2014-11-03  Paolo Carlini  

* include/parallel/algo.h: Do not use default arguments in function
template redeclarations (definitions).
* include/parallel/numeric.h: Likewise.

libstdc++-v3/

2014-12-02  Matthias Klose  

	PR libstdc++/64103
	Backport from mainline
	2014-11-03  Paolo Carlini  

	* include/parallel/algo.h: Do not use default arguments in function
	template redeclarations (definitions).
	* include/parallel/numeric.h: Likewise.

 
Index: libstdc++-v3/include/parallel/algo.h
===
--- libstdc++-v3/include/parallel/algo.h	(revision 218277)
+++ libstdc++-v3/include/parallel/algo.h	(working copy)
@@ -81,9 +81,8 @@
   template
 _Function
 __for_each_switch(_RAIter __begin, _RAIter __end, 
-_Function __f, random_access_iterator_tag, 
-__gnu_parallel::_Parallelism __parallelism_tag
-= __gnu_parallel::parallel_balanced)
+_Function __f, random_access_iterator_tag,
+__gnu_parallel::_Parallelism __parallelism_tag)
 {
   if (_GLIBCXX_PARALLEL_CONDITION(
 static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
@@ -896,8 +895,7 @@
 typename iterator_traits<_RAIter>::difference_type
 __count_switch(_RAIter __begin, _RAIter __end, 
  const _Tp& __value, random_access_iterator_tag, 
- __gnu_parallel::_Parallelism __parallelism_tag 
- = __gnu_parallel::parallel_unbalanced)
+ __gnu_parallel::_Parallelism __parallelism_tag)
 {
   typedef iterator_traits<_RAIter> _TraitsType;
   typedef typename _TraitsType::value_type _ValueType;
@@ -966,8 +964,7 @@
 typename iterator_traits<_RAIter>::difference_type
 __count_if_switch(_RAIter __begin, _RAIter __end, 
 _Predicate __pred, random_access_iterator_tag,
-__gnu_parallel::_Parallelism __parallelism_tag
-= __gnu_parallel::parallel_unbalanced)
+__gnu_parallel::_Parallelism __parallelism_tag)
 {
   typedef iterator_traits<_RAIter> _TraitsType;
   typedef typename _TraitsType::value_type _ValueType;
@@ -1225,8 +1222,7 @@
 __transform1_switch(_RAIter1 __begin, _RAIter1 __end,
   _RAIter2 __result, _UnaryOperation __unary_op,
   random_access_iterator_tag, random_access_iterator_tag,
-  __gnu_parallel::_Parallelism __parallelism_tag
-  = __gnu_parallel::parallel_balanced)
+  __gnu_parallel::_Parallelism __parallelism_tag)
 {
   if (_GLIBCXX_PARALLEL_CONDITION(
 static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
@@ -1315,8 +1311,7 @@
   _RAIter3 __result, _BinaryOperation __binary_op,
   random_access_iterator_tag, random_access_iterator_tag,
   random_access_iterator_tag,
-  __gnu_parallel::_Parallelism __parallelism_tag 
-  = __gnu_parallel::parallel_balanced)
+  __gnu_parallel::_Parallelism __parallelism_tag)
 {
   if (_GLIBCXX_PARALLEL_CONDITION(
 (__end1 - __begin1) >=
@@ -1422,8 +1417,7 @@
 __replace_switch(_RAIter __begin, _RAIter __end, 
const _Tp& __old_value, const _Tp& __new_value, 
random_access_iterator_tag, 
-   __gnu_parallel::_Parallelism __parallelism_tag
-   = __gnu_parallel::parallel_balanced)
+   __gnu_parallel::_Parallelism __parallelism_tag)
 {
   // XXX parallel version is where?
   replace(__begin, __end, __old_value, __new_value, 
@@ -1478,8 +1472,7 @@
 __replace_if_switch(_RAIter __begin, _RAIter __end,
   _Predicate __pred, const _Tp& __new_value,
   random_access_iterator_tag,
-  __gnu_parallel::_Parallelism __parallelism_tag
-  = __gnu_parallel::parallel_balanced)
+  __gnu_parallel::_Parallelism __parallelism_tag)
 {
   if (_GLIBCXX_PARALLEL_CONDITION(
 static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
@@ -1544,8 +1537,7 @@
 void
 __generate_switch(_RAIter __begin, _RAIter __end,
 _Generator __gen, random_access_iterator_tag, 
-__gnu_parallel::_Parallelism __parallelism_tag
-= __gnu_parallel::parallel_balanced)
+__gnu_parallel::_Paralleli