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

        * include/parallel/algobase.h: Replace tabs by spaces;
        correct line breaks.
        * include/parallel/algorithmfwd.h: Likewise.
        * include/parallel/balanced_quicksort.h: Likewise.
        * include/parallel/base.h: Likewise.
        * include/parallel/checkers.h: Likewise.
        * include/parallel/compatibility.h: Likewise.
        * include/parallel/equally_split.h: Likewise.
        * include/parallel/find.h: Likewise.
        * include/parallel/for_each.h: Likewise.
        * include/parallel/for_each_selectors.h: Likewise.
        * include/parallel/iterator.h: Likewise.
        * include/parallel/list_partition.h: Likewise.
        * include/parallel/losertree.h: Likewise.
        * include/parallel/merge.h: Likewise.
        * include/parallel/multiseq_selection.h: Likewise.
        * include/parallel/multiway_merge.h: Likewise.
        * include/parallel/multiway_mergesort.h: Likewise.
        * include/parallel/numeric: Likewise.
        * include/parallel/numericfwd.h: Likewise.
        * include/parallel/omp_loop.h: Likewise.
        * include/parallel/omp_loop_static.h: Likewise.
        * include/parallel/par_loop.h: Likewise.
        * include/parallel/partial_sum.h: Likewise.
        * include/parallel/partition.h: Likewise.
        * include/parallel/queue.h: Likewise.
        * include/parallel/quicksort.h: Likewise.
        * include/parallel/random_number.h: Likewise.
        * include/parallel/random_shuffle.h: Likewise.
        * include/parallel/search.h: Likewise.
        * include/parallel/set_operations.h: Likewise.
        * include/parallel/settings.h: Likewise.
        * include/parallel/sort.h: Likewise.
        * include/parallel/types.h: Likewise.
        * include/parallel/unique_copy.h: Likewise.
        * include/parallel/workstealing.h: Likewise.
        * include/parallel/algo.h: Likewise;
        shorten _ForwardIterator to _FIterator.
        * include/parallel/find_selectors.h: Likewise.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151791 138bc75d-0d04-0410-961f-82ee72b054a4

38 files changed, 2351 insertions, 2119 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8b007d8c585..37de63fba14 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,45 @@
+2009-09-17  Johannes Singler  <singler@ira.uka.de>
+
+        * include/parallel/algobase.h: Replace tabs by spaces;
+        correct line breaks.
+        * include/parallel/algorithmfwd.h: Likewise.
+        * include/parallel/balanced_quicksort.h: Likewise.
+        * include/parallel/base.h: Likewise.
+        * include/parallel/checkers.h: Likewise.
+        * include/parallel/compatibility.h: Likewise.
+        * include/parallel/equally_split.h: Likewise.
+        * include/parallel/find.h: Likewise.
+        * include/parallel/for_each.h: Likewise.
+        * include/parallel/for_each_selectors.h: Likewise.
+        * include/parallel/iterator.h: Likewise.
+        * include/parallel/list_partition.h: Likewise.
+        * include/parallel/losertree.h: Likewise.
+        * include/parallel/merge.h: Likewise.
+        * include/parallel/multiseq_selection.h: Likewise.
+        * include/parallel/multiway_merge.h: Likewise.
+        * include/parallel/multiway_mergesort.h: Likewise.
+        * include/parallel/numeric: Likewise.
+        * include/parallel/numericfwd.h: Likewise.
+        * include/parallel/omp_loop.h: Likewise.
+        * include/parallel/omp_loop_static.h: Likewise.
+        * include/parallel/par_loop.h: Likewise.
+        * include/parallel/partial_sum.h: Likewise.
+        * include/parallel/partition.h: Likewise.
+        * include/parallel/queue.h: Likewise.
+        * include/parallel/quicksort.h: Likewise.
+        * include/parallel/random_number.h: Likewise.
+        * include/parallel/random_shuffle.h: Likewise.
+        * include/parallel/search.h: Likewise.
+        * include/parallel/set_operations.h: Likewise.
+        * include/parallel/settings.h: Likewise.
+        * include/parallel/sort.h: Likewise.
+        * include/parallel/types.h: Likewise.
+        * include/parallel/unique_copy.h: Likewise.
+        * include/parallel/workstealing.h: Likewise.
+        * include/parallel/algo.h: Likewise;
+        shorten _ForwardIterator to _FIterator.
+        * include/parallel/find_selectors.h: Likewise.
+
 2009-09-16  Johannes Singler  <singler@ira.uka.de>
 
         * include/parallel/base.h: Correct some comments accidentally changed
diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h
index a94962d13f5..1a75d24b917 100644
--- a/libstdc++-v3/include/parallel/algo.h
+++ b/libstdc++-v3/include/parallel/algo.h
@@ -94,9 +94,10 @@ namespace __parallel
     __gnu_parallel::__for_each_selector<_RAIter> __functionality;
 
           return __gnu_parallel::
-            __for_each_template_random_access(__begin, __end, __f, __functionality,
-                                            __gnu_parallel::_DummyReduct(),
-                                            true, __dummy, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __f, __functionality,
+              __gnu_parallel::_DummyReduct(), true, __dummy, -1,
+              __parallelism_tag);
         }
       else
         return for_each(__begin, __end, __f, __gnu_parallel::sequential_tag());
@@ -151,9 +152,9 @@ namespace __parallel
         {
           binder2nd<__gnu_parallel::equal_to<_ValueType, const _Tp&> >
             __comp(__gnu_parallel::equal_to<_ValueType, const _Tp&>(), __val);
-          return __gnu_parallel::__find_template(__begin, __end, __begin, __comp,
-                                               __gnu_parallel::
-                                               __find_if_selector()).first;
+          return __gnu_parallel::__find_template(
+                   __begin, __end, __begin, __comp,
+                   __gnu_parallel::__find_if_selector()).first;
         }
       else
         return _GLIBCXX_STD_P::find(__begin, __end, __val);
@@ -190,7 +191,7 @@ namespace __parallel
                    _Predicate __pred, random_access_iterator_tag)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(true))
-        return __gnu_parallel::__find_template(__begin, __end, __begin, __pred, 
+        return __gnu_parallel::__find_template(__begin, __end, __begin, __pred,
                                              __gnu_parallel::
                                              __find_if_selector()).first;
       else
@@ -208,69 +209,71 @@ namespace __parallel
     }
 
   // Sequential fallback
-  template<typename _IIter, typename _ForwardIterator>
+  template<typename _IIter, typename _FIterator>
     inline _IIter
     find_first_of(_IIter __begin1, _IIter __end1, 
-                  _ForwardIterator __begin2, _ForwardIterator __end2, 
+                  _FIterator __begin2, _FIterator __end2, 
                   __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::find_first_of(__begin1, __end1, __begin2, __end2); }
+    { return _GLIBCXX_STD_P::find_first_of(__begin1, __end1, __begin2, __end2);
+      }
 
   // Sequential fallback
-  template<typename _IIter, typename _ForwardIterator,
+  template<typename _IIter, typename _FIterator,
            typename _BinaryPredicate>
     inline _IIter
     find_first_of(_IIter __begin1, _IIter __end1,
-                  _ForwardIterator __begin2, _ForwardIterator __end2,
+                  _FIterator __begin2, _FIterator __end2,
                   _BinaryPredicate __comp, __gnu_parallel::sequential_tag)
-  { return _GLIBCXX_STD_P::find_first_of(__begin1, __end1, __begin2, __end2, __comp); }
+  { return _GLIBCXX_STD_P::find_first_of(
+             __begin1, __end1, __begin2, __end2, __comp); }
 
   // Sequential fallback for input iterator type
-  template<typename _IIter, typename _ForwardIterator,
+  template<typename _IIter, typename _FIterator,
            typename _IteratorTag1, typename _IteratorTag2>
     inline _IIter
     __find_first_of_switch(_IIter __begin1, _IIter __end1,
-                         _ForwardIterator __begin2, _ForwardIterator __end2, 
+                         _FIterator __begin2, _FIterator __end2, 
                          _IteratorTag1, _IteratorTag2)
     { return find_first_of(__begin1, __end1, __begin2, __end2, 
                            __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators
-  template<typename _RAIter, typename _ForwardIterator,
+  template<typename _RAIter, typename _FIterator,
            typename _BinaryPredicate, typename _IteratorTag>
     inline _RAIter
     __find_first_of_switch(_RAIter __begin1,
                          _RAIter __end1,
-                         _ForwardIterator __begin2, _ForwardIterator __end2, 
+                         _FIterator __begin2, _FIterator __end2, 
                          _BinaryPredicate __comp, random_access_iterator_tag, 
                          _IteratorTag)
     {
       return __gnu_parallel::
         __find_template(__begin1, __end1, __begin1, __comp,
                       __gnu_parallel::__find_first_of_selector
-                      <_ForwardIterator>(__begin2, __end2)).first;
+                      <_FIterator>(__begin2, __end2)).first;
     }
 
   // Sequential fallback for input iterator type
-  template<typename _IIter, typename _ForwardIterator,
+  template<typename _IIter, typename _FIterator,
            typename _BinaryPredicate, typename _IteratorTag1,
            typename _IteratorTag2>
     inline _IIter
     __find_first_of_switch(_IIter __begin1, _IIter __end1,
-                         _ForwardIterator __begin2, _ForwardIterator __end2, 
+                         _FIterator __begin2, _FIterator __end2, 
                          _BinaryPredicate __comp, _IteratorTag1, _IteratorTag2)
     { return find_first_of(__begin1, __end1, __begin2, __end2, __comp, 
                            __gnu_parallel::sequential_tag()); }
 
   // Public interface
-  template<typename _IIter, typename _ForwardIterator,
+  template<typename _IIter, typename _FIterator,
            typename _BinaryPredicate>
     inline _IIter
     find_first_of(_IIter __begin1, _IIter __end1,
-                  _ForwardIterator __begin2, _ForwardIterator __end2, 
+                  _FIterator __begin2, _FIterator __end2, 
                   _BinaryPredicate __comp)
     {
       typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_ForwardIterator> iteratorf_traits;
+      typedef std::iterator_traits<_FIterator> iteratorf_traits;
       typedef typename _IIterTraits::iterator_category _IIteratorCategory;
       typedef typename iteratorf_traits::iterator_category iteratorf_category;
 
@@ -279,13 +282,13 @@ namespace __parallel
     }
 
   // Public interface, insert default comparator
-  template<typename _IIter, typename _ForwardIterator>
+  template<typename _IIter, typename _FIterator>
     inline _IIter
     find_first_of(_IIter __begin1, _IIter __end1, 
-                  _ForwardIterator __begin2, _ForwardIterator __end2)
+                  _FIterator __begin2, _FIterator __end2)
     {
       typedef std::iterator_traits<_IIter> _IIterTraits;
-      typedef std::iterator_traits<_ForwardIterator> iteratorf_traits;
+      typedef std::iterator_traits<_FIterator> iteratorf_traits;
       typedef typename _IIterTraits::value_type _IValueType;
       typedef typename iteratorf_traits::value_type _FValueType;
 
@@ -328,7 +331,8 @@ namespace __parallel
       if (_GLIBCXX_PARALLEL_CONDITION(
             static_cast<__gnu_parallel::_SequenceIndex>(__last - __begin)
             > __gnu_parallel::_Settings::get().unique_copy_minimal_n))
-        return __gnu_parallel::__parallel_unique_copy(__begin, __last, __out, __pred);
+        return __gnu_parallel::__parallel_unique_copy(
+                 __begin, __last, __out, __pred);
       else
         return _GLIBCXX_STD_P::unique_copy(__begin, __last, __out, __pred);
     }
@@ -344,8 +348,9 @@ namespace __parallel
       typedef typename _IIterTraits::value_type _ValueType;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __unique_copy_switch(__begin1, __end1, __out, equal_to<_ValueType>(),
-                                _IIteratorCategory(), _OIterCategory());
+      return __unique_copy_switch(
+               __begin1, __end1, __out, equal_to<_ValueType>(),
+               _IIteratorCategory(), _OIterCategory());
     }
 
   // Public interface
@@ -359,8 +364,9 @@ namespace __parallel
       typedef typename _IIterTraits::iterator_category _IIteratorCategory;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __unique_copy_switch(__begin1, __end1, __out, __pred, _IIteratorCategory(), 
-                                _OIterCategory());
+      return __unique_copy_switch(
+               __begin1, __end1, __out, __pred,
+               _IIteratorCategory(), _OIterCategory());
     }
 
   // Sequential fallback
@@ -370,7 +376,8 @@ namespace __parallel
     set_union(_IIter1 __begin1, _IIter1 __end1,
               _IIter2 __begin2, _IIter2 __end2,
               _OutputIterator __out, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::set_union(__begin1, __end1, __begin2, __end2, __out); }
+    { return _GLIBCXX_STD_P::set_union(
+               __begin1, __end1, __begin2, __end2, __out); }
 
   // Sequential fallback
   template<typename _IIter1, typename _IIter2,
@@ -384,14 +391,14 @@ namespace __parallel
                                        __begin2, __end2, __out, __pred); }
 
   // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _OutputIterator,
-           typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag3>
+  template<typename _IIter1, typename _IIter2, typename _Predicate,
+           typename _OutputIterator, typename _IteratorTag1,
+           typename _IteratorTag2, typename _IteratorTag3>
     inline _OutputIterator
-    __set_union_switch(_IIter1 __begin1, _IIter1 __end1, 
-                     _IIter2 __begin2, _IIter2 __end2, 
-                     _OutputIterator __result, _Predicate __pred, _IteratorTag1,
-                     _IteratorTag2, _IteratorTag3)
+    __set_union_switch(
+      _IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
+      _OutputIterator __result, _Predicate __pred,
+      _IteratorTag1, _IteratorTag2, _IteratorTag3)
     { return _GLIBCXX_STD_P::set_union(__begin1, __end1,
                                        __begin2, __end2, __result, __pred); }
 
@@ -410,8 +417,8 @@ namespace __parallel
             >= __gnu_parallel::_Settings::get().set_union_minimal_n
             || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
             >= __gnu_parallel::_Settings::get().set_union_minimal_n))
-        return __gnu_parallel::__parallel_set_union(__begin1, __end1,
-                                                  __begin2, __end2, __result, __pred);
+        return __gnu_parallel::__parallel_set_union(
+                 __begin1, __end1, __begin2, __end2, __result, __pred);
       else
         return _GLIBCXX_STD_P::set_union(__begin1, __end1,
                                          __begin2, __end2, __result, __pred);
@@ -435,10 +442,10 @@ namespace __parallel
       typedef typename _IIterTraits1::value_type _ValueType1;
       typedef typename _IIterTraits2::value_type _ValueType2;
 
-      return __set_union_switch(__begin1, __end1, __begin2, __end2, __out, 
-                              __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
-                              _IIterCategory1(), _IIterCategory2(),
-                              _OIterCategory());
+      return __set_union_switch(
+               __begin1, __end1, __begin2, __end2, __out,
+               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Public interface
@@ -458,9 +465,9 @@ namespace __parallel
         _IIterCategory2;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __set_union_switch(__begin1, __end1, __begin2, __end2, __out, __pred,
-                              _IIterCategory1(), _IIterCategory2(),
-                              _OIterCategory());
+      return __set_union_switch(
+               __begin1, __end1, __begin2, __end2, __out, __pred,
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Sequential fallback.
@@ -481,8 +488,8 @@ namespace __parallel
                      _IIter2 __begin2, _IIter2 __end2,
                      _OutputIterator __out, _Predicate __pred, 
                      __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::set_intersection(__begin1, __end1, __begin2, __end2, 
-                                              __out, __pred); }
+    { return _GLIBCXX_STD_P::set_intersection(
+               __begin1, __end1, __begin2, __end2, __out, __pred); }
 
   // Sequential fallback for input iterator case
   template<typename _IIter1, typename _IIter2,
@@ -490,11 +497,11 @@ namespace __parallel
            typename _IteratorTag1, typename _IteratorTag2,
            typename _IteratorTag3>
     inline _OutputIterator 
-    __set_intersection_switch(_IIter1 __begin1, _IIter1 __end1, 
-                            _IIter2 __begin2, _IIter2 __end2, 
-                            _OutputIterator __result, _Predicate __pred, 
-                            _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_P::set_intersection(__begin1, __end1, __begin2, 
+    __set_intersection_switch(_IIter1 __begin1, _IIter1 __end1,
+                              _IIter2 __begin2, _IIter2 __end2,
+                              _OutputIterator __result, _Predicate __pred,
+                              _IteratorTag1, _IteratorTag2, _IteratorTag3)
+    { return _GLIBCXX_STD_P::set_intersection(__begin1, __end1, __begin2,
                                               __end2, __result, __pred); }
 
   // Parallel set_intersection for random access iterators
@@ -516,11 +523,11 @@ namespace __parallel
             >= __gnu_parallel::_Settings::get().set_union_minimal_n
             || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
             >= __gnu_parallel::_Settings::get().set_union_minimal_n))
-        return __gnu_parallel::__parallel_set_intersection(__begin1, __end1, __begin2, 
-                                                         __end2, __result, __pred);
+        return __gnu_parallel::__parallel_set_intersection(
+                 __begin1, __end1, __begin2, __end2, __result, __pred);
       else
-        return _GLIBCXX_STD_P::set_intersection(__begin1, __end1, __begin2, 
-                                                __end2, __result, __pred);
+        return _GLIBCXX_STD_P::set_intersection(
+                 __begin1, __end1, __begin2, __end2, __result, __pred);
     }
 
   // Public interface
@@ -542,12 +549,10 @@ namespace __parallel
       typedef typename _IIterTraits1::value_type _ValueType1;
       typedef typename _IIterTraits2::value_type _ValueType2;
 
-      return __set_intersection_switch(__begin1, __end1, __begin2, __end2, __out,
-                                     __gnu_parallel::
-                                     _Less<_ValueType1, _ValueType2>(),
-                                     _IIterCategory1(),
-                                     _IIterCategory2(), 
-                                     _OIterCategory());
+      return __set_intersection_switch(
+               __begin1, __end1, __begin2, __end2, __out,
+               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   template<typename _IIter1, typename _IIter2,
@@ -566,10 +571,9 @@ namespace __parallel
         _IIterCategory2;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __set_intersection_switch(__begin1, __end1, __begin2, __end2, __out, __pred,
-                                     _IIterCategory1(),
-                                     _IIterCategory2(),
-                                     _OIterCategory());
+      return __set_intersection_switch(
+               __begin1, __end1, __begin2, __end2, __out, __pred,
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Sequential fallback
@@ -580,8 +584,8 @@ namespace __parallel
                              _IIter2 __begin2, _IIter2 __end2,
                              _OutputIterator __out,
                              __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::set_symmetric_difference(__begin1,__end1,
-                                                      __begin2, __end2, __out); }
+    { return _GLIBCXX_STD_P::set_symmetric_difference(
+               __begin1, __end1, __begin2, __end2, __out); }
 
   // Sequential fallback
   template<typename _IIter1, typename _IIter2,
@@ -591,8 +595,8 @@ namespace __parallel
                              _IIter2 __begin2, _IIter2 __end2,
                              _OutputIterator __out, _Predicate __pred,
                              __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::set_symmetric_difference(__begin1, __end1, __begin2,
-                                                      __end2, __out, __pred); }
+    { return _GLIBCXX_STD_P::set_symmetric_difference(
+               __begin1, __end1, __begin2, __end2, __out, __pred); }
 
   // Sequential fallback for input iterator case
   template<typename _IIter1, typename _IIter2,
@@ -600,15 +604,12 @@ namespace __parallel
            typename _IteratorTag1, typename _IteratorTag2,
            typename _IteratorTag3>
     inline _OutputIterator 
-    __set_symmetric_difference_switch(_IIter1 __begin1,
-                                    _IIter1 __end1,
-                                    _IIter2 __begin2,
-                                    _IIter2 __end2,
-                                    _OutputIterator __result, _Predicate __pred,
-                                    _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_P::set_symmetric_difference(__begin1, __end1,
-                                                      __begin2, __end2,
-                                                      __result, __pred); }
+    __set_symmetric_difference_switch(
+      _IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, _IIter2 __end2,
+      _OutputIterator __result, _Predicate __pred,
+      _IteratorTag1, _IteratorTag2, _IteratorTag3)
+    { return _GLIBCXX_STD_P::set_symmetric_difference(
+               __begin1, __end1, __begin2, __end2, __result, __pred); }
 
   // Parallel set_symmetric_difference for random access iterators
   template<typename _RAIter1, typename _RAIter2,
@@ -629,13 +630,11 @@ namespace __parallel
       >= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n
       || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
       >= __gnu_parallel::_Settings::get().set_symmetric_difference_minimal_n))
-  return __gnu_parallel::__parallel_set_symmetric_difference(__begin1, __end1,
-                                                                 __begin2, __end2,
-                                                                 __result, __pred);
+  return __gnu_parallel::__parallel_set_symmetric_difference(
+           __begin1, __end1, __begin2, __end2, __result, __pred);
       else
-        return _GLIBCXX_STD_P::set_symmetric_difference(__begin1, __end1,
-                                                        __begin2, __end2,
-                                                        __result, __pred);
+        return _GLIBCXX_STD_P::set_symmetric_difference(
+                 __begin1, __end1, __begin2, __end2, __result, __pred);
     }
 
   // Public interface.
@@ -657,12 +656,10 @@ namespace __parallel
       typedef typename _IIterTraits1::value_type _ValueType1;
       typedef typename _IIterTraits2::value_type _ValueType2;
 
-      return __set_symmetric_difference_switch(__begin1, __end1, __begin2, __end2, __out,
-                                             __gnu_parallel::
-                                             _Less<_ValueType1, _ValueType2>(),
-                                             _IIterCategory1(),
-                                             _IIterCategory2(),
-                                             _OIterCategory());
+      return __set_symmetric_difference_switch(
+               __begin1, __end1, __begin2, __end2, __out,
+               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Public interface.
@@ -682,10 +679,9 @@ namespace __parallel
         _IIterCategory2;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __set_symmetric_difference_switch(__begin1, __end1, __begin2, __end2, __out,
-                                             __pred, _IIterCategory1(),
-                                             _IIterCategory2(),
-                                             _OIterCategory());
+      return __set_symmetric_difference_switch(
+               __begin1, __end1, __begin2, __end2, __out, __pred,
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Sequential fallback.
@@ -695,7 +691,8 @@ namespace __parallel
     set_difference(_IIter1 __begin1, _IIter1 __end1, 
                    _IIter2 __begin2, _IIter2 __end2, 
                    _OutputIterator __out, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::set_difference(__begin1,__end1, __begin2, __end2, __out); }
+    { return _GLIBCXX_STD_P::set_difference(
+               __begin1,__end1, __begin2, __end2, __out); }
 
   // Sequential fallback.
   template<typename _IIter1, typename _IIter2,
@@ -709,16 +706,16 @@ namespace __parallel
                                             __begin2, __end2, __out, __pred); }
 
   // Sequential fallback for input iterator case.
-  template<typename _IIter1, typename _IIter2,
-           typename _Predicate, typename _OutputIterator,
-           typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag3>
+  template<typename _IIter1, typename _IIter2, typename _Predicate,
+           typename _OutputIterator, typename _IteratorTag1,
+           typename _IteratorTag2, typename _IteratorTag3>
     inline _OutputIterator
     __set_difference_switch(_IIter1 __begin1, _IIter1 __end1, 
                           _IIter2 __begin2, _IIter2 __end2, 
                           _OutputIterator __result, _Predicate __pred, 
                           _IteratorTag1, _IteratorTag2, _IteratorTag3)
-    { return _GLIBCXX_STD_P::set_difference(__begin1, __end1,
-                                            __begin2, __end2, __result, __pred); }
+    { return _GLIBCXX_STD_P::set_difference(
+               __begin1, __end1, __begin2, __end2, __result, __pred); }
 
   // Parallel set_difference for random access iterators
   template<typename _RAIter1, typename _RAIter2,
@@ -738,12 +735,11 @@ namespace __parallel
             >= __gnu_parallel::_Settings::get().set_difference_minimal_n
             || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
             >= __gnu_parallel::_Settings::get().set_difference_minimal_n))
-        return __gnu_parallel::__parallel_set_difference(__begin1, __end1,
-                                                       __begin2, __end2,
-                                                       __result, __pred);
+        return __gnu_parallel::__parallel_set_difference(
+                 __begin1, __end1, __begin2, __end2, __result, __pred);
       else
-        return _GLIBCXX_STD_P::set_difference(__begin1, __end1,
-                                              __begin2, __end2, __result, __pred);
+        return _GLIBCXX_STD_P::set_difference(
+                 __begin1, __end1, __begin2, __end2, __result, __pred);
     }
 
   // Public interface
@@ -765,12 +761,10 @@ namespace __parallel
       typedef typename _IIterTraits1::value_type _ValueType1;
       typedef typename _IIterTraits2::value_type _ValueType2;
 
-      return __set_difference_switch(__begin1, __end1, __begin2, __end2, __out,
-                                   __gnu_parallel::
-                                   _Less<_ValueType1, _ValueType2>(), 
-                                   _IIterCategory1(),
-                                   _IIterCategory2(), 
-                                   _OIterCategory());
+      return __set_difference_switch(
+               __begin1, __end1, __begin2, __end2, __out,
+               __gnu_parallel::_Less<_ValueType1, _ValueType2>(),
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Public interface
@@ -790,24 +784,24 @@ namespace __parallel
         _IIterCategory2;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __set_difference_switch(__begin1, __end1, __begin2, __end2, __out, __pred,
-                                   _IIterCategory1(),
-                                   _IIterCategory2(), 
-                                   _OIterCategory());
+      return __set_difference_switch(
+               __begin1, __end1, __begin2, __end2, __out, __pred,
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Sequential fallback
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    adjacent_find(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator>
+    inline _FIterator
+    adjacent_find(_FIterator __begin, _FIterator __end, 
                   __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::adjacent_find(__begin, __end); }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    inline _ForwardIterator
-    adjacent_find(_ForwardIterator __begin, _ForwardIterator __end, 
-                  _BinaryPredicate __binary_pred, __gnu_parallel::sequential_tag)
+  template<typename _FIterator, typename _BinaryPredicate>
+    inline _FIterator
+    adjacent_find(_FIterator __begin, _FIterator __end, 
+                  _BinaryPredicate __binary_pred,
+                  __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::adjacent_find(__begin, __end, __binary_pred); }
 
   // Parallel algorithm for random access iterators
@@ -822,8 +816,10 @@ namespace __parallel
       if (_GLIBCXX_PARALLEL_CONDITION(true))
         {
           _RAIter spot = __gnu_parallel::
-            __find_template(__begin, __end - 1, __begin, equal_to<_ValueType>(),
-                          __gnu_parallel::__adjacent_find_selector()).first;
+              __find_template(
+                __begin, __end - 1, __begin, equal_to<_ValueType>(),
+                __gnu_parallel::__adjacent_find_selector())
+            .first;
           if (spot == (__end - 1))
             return __end;
           else
@@ -834,27 +830,27 @@ namespace __parallel
     }
 
   // Sequential fallback for input iterator case
-  template<typename _ForwardIterator, typename _IteratorTag>
-    inline _ForwardIterator
-    __adjacent_find_switch(_ForwardIterator __begin, _ForwardIterator __end,
+  template<typename _FIterator, typename _IteratorTag>
+    inline _FIterator
+    __adjacent_find_switch(_FIterator __begin, _FIterator __end,
                          _IteratorTag)
     { return adjacent_find(__begin, __end, __gnu_parallel::sequential_tag()); }
 
   // Public interface
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    adjacent_find(_ForwardIterator __begin, _ForwardIterator __end)
+  template<typename _FIterator>
+    inline _FIterator
+    adjacent_find(_FIterator __begin, _FIterator __end)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
       return __adjacent_find_switch(__begin, __end, _IteratorCategory());
     }
 
   // Sequential fallback for input iterator case
-  template<typename _ForwardIterator, typename _BinaryPredicate,
+  template<typename _FIterator, typename _BinaryPredicate,
            typename _IteratorTag>
-    inline _ForwardIterator
-    __adjacent_find_switch(_ForwardIterator __begin, _ForwardIterator __end, 
+    inline _FIterator
+    __adjacent_find_switch(_FIterator __begin, _FIterator __end, 
                          _BinaryPredicate __pred, _IteratorTag)
     { return adjacent_find(__begin, __end, __pred,
                            __gnu_parallel::sequential_tag()); }
@@ -866,7 +862,7 @@ namespace __parallel
                          _BinaryPredicate __pred, random_access_iterator_tag)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(true))
-        return __gnu_parallel::__find_template(__begin, __end, __begin, __pred, 
+        return __gnu_parallel::__find_template(__begin, __end, __begin, __pred,
                                              __gnu_parallel::
                                              __adjacent_find_selector()).first;
       else
@@ -875,14 +871,15 @@ namespace __parallel
     }
 
   // Public interface
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    inline _ForwardIterator
-    adjacent_find(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator, typename _BinaryPredicate>
+    inline _FIterator
+    adjacent_find(_FIterator __begin, _FIterator __end, 
                   _BinaryPredicate __pred)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __adjacent_find_switch(__begin, __end, __pred, _IteratorCategory());
+      return __adjacent_find_switch(__begin, __end, __pred,
+                                    _IteratorCategory());
     }
 
   // Sequential fallback
@@ -914,14 +911,15 @@ namespace __parallel
             __functionality;
           _DifferenceType __res = 0;
           __gnu_parallel::
-            __for_each_template_random_access(__begin, __end, __value,
-                                            __functionality,
-                                            std::plus<_SequenceIndex>(),
-                                            __res, __res, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __value, __functionality,
+              std::plus<_SequenceIndex>(), __res, __res, -1,
+              __parallelism_tag);
           return __res;
         }
       else
-        return count(__begin, __end, __value, __gnu_parallel::sequential_tag());
+        return count(__begin, __end, __value,
+                     __gnu_parallel::sequential_tag());
     }
 
   // Sequential fallback for input iterator case.
@@ -929,7 +927,8 @@ namespace __parallel
     inline typename iterator_traits<_IIter>::difference_type
     __count_switch(_IIter __begin, _IIter __end, const _Tp& __value, 
                  _IteratorTag)
-    { return count(__begin, __end, __value, __gnu_parallel::sequential_tag()); }
+    { return count(__begin, __end, __value, __gnu_parallel::sequential_tag());
+      }
 
   // Public interface.
   template<typename _IIter, typename _Tp>
@@ -939,8 +938,8 @@ namespace __parallel
     {
       typedef iterator_traits<_IIter> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
-      return __count_switch(__begin, __end, __value, _IteratorCategory(), 
-                          __parallelism_tag);
+      return __count_switch(__begin, __end, __value, _IteratorCategory(),
+                            __parallelism_tag);
     }
 
   template<typename _IIter, typename _Tp>
@@ -964,7 +963,7 @@ namespace __parallel
   template<typename _RAIter, typename _Predicate>
     typename iterator_traits<_RAIter>::difference_type
     __count_if_switch(_RAIter __begin, _RAIter __end, 
-                    _Predicate __pred, random_access_iterator_tag, 
+                    _Predicate __pred, random_access_iterator_tag,
                     __gnu_parallel::_Parallelism __parallelism_tag
                     = __gnu_parallel::parallel_unbalanced)
     {
@@ -983,14 +982,15 @@ namespace __parallel
             __count_if_selector<_RAIter, _DifferenceType>
             __functionality;
           __gnu_parallel::
-            __for_each_template_random_access(__begin, __end, __pred,
-                                            __functionality,
-                                            std::plus<_SequenceIndex>(),
-                                            __res, __res, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __pred, __functionality,
+              std::plus<_SequenceIndex>(), __res, __res, -1,
+              __parallelism_tag);
           return __res;
         }
       else
-        return count_if(__begin, __end, __pred, __gnu_parallel::sequential_tag());
+        return count_if(__begin, __end, __pred,
+                        __gnu_parallel::sequential_tag());
     }
 
   // Sequential fallback for input iterator case.
@@ -998,7 +998,8 @@ namespace __parallel
     inline typename iterator_traits<_IIter>::difference_type
     __count_if_switch(_IIter __begin, _IIter __end, _Predicate __pred, 
                     _IteratorTag)
-    { return count_if(__begin, __end, __pred, __gnu_parallel::sequential_tag()); }
+    { return count_if(__begin, __end, __pred,
+                      __gnu_parallel::sequential_tag()); }
 
   // Public interface.
   template<typename _IIter, typename _Predicate>
@@ -1023,10 +1024,10 @@ namespace __parallel
 
 
   // Sequential fallback.
-  template<typename ForwardIterator1, typename ForwardIterator2>
-    inline ForwardIterator1
-    search(ForwardIterator1 __begin1, ForwardIterator1 __end1,
-           ForwardIterator2 __begin2, ForwardIterator2 __end2,
+  template<typename _FIterator1, typename _FIterator2>
+    inline _FIterator1
+    search(_FIterator1 __begin1, _FIterator1 __end1,
+           _FIterator2 __begin2, _FIterator2 __end2,
            __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::search(__begin1, __end1, __begin2, __end2); }
 
@@ -1044,32 +1045,33 @@ namespace __parallel
 
       if (_GLIBCXX_PARALLEL_CONDITION(true))
         return __gnu_parallel::
-          __search_template(__begin1, __end1, __begin2, __end2, __gnu_parallel::
-                          equal_to<_ValueType1, _ValueType2>());
+          __search_template(
+            __begin1, __end1, __begin2, __end2,
+            __gnu_parallel::equal_to<_ValueType1, _ValueType2>());
       else
         return search(__begin1, __end1, __begin2, __end2,
                       __gnu_parallel::sequential_tag());
     }
 
   // Sequential fallback for input iterator case
-  template<typename ForwardIterator1, typename ForwardIterator2,
+  template<typename _FIterator1, typename _FIterator2,
            typename _IteratorTag1, typename _IteratorTag2>
-    inline ForwardIterator1
-    __search_switch(ForwardIterator1 __begin1, ForwardIterator1 __end1,
-                  ForwardIterator2 __begin2, ForwardIterator2 __end2,
+    inline _FIterator1
+    __search_switch(_FIterator1 __begin1, _FIterator1 __end1,
+                  _FIterator2 __begin2, _FIterator2 __end2,
                   _IteratorTag1, _IteratorTag2)
     { return search(__begin1, __end1, __begin2, __end2,
                     __gnu_parallel::sequential_tag()); }
 
   // Public interface.
-  template<typename ForwardIterator1, typename ForwardIterator2>
-    inline ForwardIterator1
-    search(ForwardIterator1 __begin1, ForwardIterator1 __end1,
-           ForwardIterator2 __begin2, ForwardIterator2 __end2)
+  template<typename _FIterator1, typename _FIterator2>
+    inline _FIterator1
+    search(_FIterator1 __begin1, _FIterator1 __end1,
+           _FIterator2 __begin2, _FIterator2 __end2)
     {
-      typedef std::iterator_traits<ForwardIterator1> iterator1_traits;
+      typedef std::iterator_traits<_FIterator1> iterator1_traits;
       typedef typename iterator1_traits::iterator_category _IteratorCategory1;
-      typedef std::iterator_traits<ForwardIterator2> iterator2_traits;
+      typedef std::iterator_traits<_FIterator2> iterator2_traits;
       typedef typename iterator2_traits::iterator_category _IteratorCategory2;
 
       return __search_switch(__begin1, __end1, __begin2, __end2,
@@ -1077,13 +1079,14 @@ namespace __parallel
     }
 
   // Public interface.
-  template<typename ForwardIterator1, typename ForwardIterator2,
+  template<typename _FIterator1, typename _FIterator2,
            typename _BinaryPredicate>
-    inline ForwardIterator1
-    search(ForwardIterator1 __begin1, ForwardIterator1 __end1,
-           ForwardIterator2 __begin2, ForwardIterator2 __end2,
+    inline _FIterator1
+    search(_FIterator1 __begin1, _FIterator1 __end1,
+           _FIterator2 __begin2, _FIterator2 __end2,
            _BinaryPredicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::search(__begin1, __end1, __begin2, __end2, __pred); }
+    { return _GLIBCXX_STD_P::search(
+                               __begin1, __end1, __begin2, __end2, __pred); }
 
   // Parallel algorithm for random access iterator.
   template<typename _RAIter1, typename _RAIter2,
@@ -1103,55 +1106,56 @@ namespace __parallel
     }
 
   // Sequential fallback for input iterator case
-  template<typename ForwardIterator1, typename ForwardIterator2,
+  template<typename _FIterator1, typename _FIterator2,
            typename _BinaryPredicate, typename _IteratorTag1,
            typename _IteratorTag2>
-    inline ForwardIterator1
-    __search_switch(ForwardIterator1 __begin1, ForwardIterator1 __end1,
-                  ForwardIterator2 __begin2, ForwardIterator2 __end2,
+    inline _FIterator1
+    __search_switch(_FIterator1 __begin1, _FIterator1 __end1,
+                  _FIterator2 __begin2, _FIterator2 __end2,
                   _BinaryPredicate __pred, _IteratorTag1, _IteratorTag2)
     { return search(__begin1, __end1, __begin2, __end2, __pred,
                     __gnu_parallel::sequential_tag()); }
 
   // Public interface
-  template<typename ForwardIterator1, typename ForwardIterator2,
+  template<typename _FIterator1, typename _FIterator2,
            typename _BinaryPredicate>
-    inline ForwardIterator1
-    search(ForwardIterator1 __begin1, ForwardIterator1 __end1,
-           ForwardIterator2 __begin2, ForwardIterator2 __end2,
+    inline _FIterator1
+    search(_FIterator1 __begin1, _FIterator1 __end1,
+           _FIterator2 __begin2, _FIterator2 __end2,
            _BinaryPredicate  __pred)
     {
-      typedef std::iterator_traits<ForwardIterator1> iterator1_traits;
+      typedef std::iterator_traits<_FIterator1> iterator1_traits;
       typedef typename iterator1_traits::iterator_category _IteratorCategory1;
-      typedef std::iterator_traits<ForwardIterator2> iterator2_traits;
+      typedef std::iterator_traits<_FIterator2> iterator2_traits;
       typedef typename iterator2_traits::iterator_category _IteratorCategory2;
       return __search_switch(__begin1, __end1, __begin2, __end2, __pred,
                            _IteratorCategory1(), _IteratorCategory2());
     }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _Integer, typename _Tp>
-    inline _ForwardIterator
-    search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count,
+  template<typename _FIterator, typename _Integer, typename _Tp>
+    inline _FIterator
+    search_n(_FIterator __begin, _FIterator __end, _Integer count,
              const _Tp& __val, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::search_n(__begin, __end, count, __val); }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _Integer, typename _Tp,
+  template<typename _FIterator, typename _Integer, typename _Tp,
            typename _BinaryPredicate>
-    inline _ForwardIterator
-    search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count,
+    inline _FIterator
+    search_n(_FIterator __begin, _FIterator __end, _Integer count,
              const _Tp& __val, _BinaryPredicate __binary_pred,
              __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::search_n(__begin, __end, count, __val, __binary_pred); }
+    { return _GLIBCXX_STD_P::search_n(
+               __begin, __end, count, __val, __binary_pred); }
 
   // Public interface.
-  template<typename _ForwardIterator, typename _Integer, typename _Tp>
-    inline _ForwardIterator
-    search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count,
+  template<typename _FIterator, typename _Integer, typename _Tp>
+    inline _FIterator
+    search_n(_FIterator __begin, _FIterator __end, _Integer count,
              const _Tp& __val)
     {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
+      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
       return search_n(__begin, __end, count, __val,
                       __gnu_parallel::equal_to<_ValueType, _Tp>());
     }
@@ -1160,15 +1164,15 @@ namespace __parallel
   template<typename _RAIter, typename _Integer,
            typename _Tp, typename _BinaryPredicate>
     _RAIter
-    __search_n_switch(_RAIter __begin, _RAIter __end,
-                    _Integer count, const _Tp& __val, _BinaryPredicate __binary_pred,
-                    random_access_iterator_tag)
+    __search_n_switch(_RAIter __begin, _RAIter __end, _Integer count,
+                      const _Tp& __val, _BinaryPredicate __binary_pred,
+                      random_access_iterator_tag)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(true))
         {
           __gnu_parallel::_PseudoSequence<_Tp, _Integer> __ps(__val, count);
-          return __gnu_parallel::__search_template(__begin, __end, __ps.begin(),
-                                                 __ps.end(), __binary_pred);
+          return __gnu_parallel::__search_template(
+                   __begin, __end, __ps.begin(), __ps.end(), __binary_pred);
         }
       else
         return std::__search_n(__begin, __end, count, __val,
@@ -1176,22 +1180,24 @@ namespace __parallel
     }
 
   // Sequential fallback for input iterator case.
-  template<typename _ForwardIterator, typename _Integer, typename _Tp,
+  template<typename _FIterator, typename _Integer, typename _Tp,
            typename _BinaryPredicate, typename _IteratorTag>
-    inline _ForwardIterator
-    __search_n_switch(_ForwardIterator __begin, _ForwardIterator __end, _Integer count,
-                    const _Tp& __val, _BinaryPredicate __binary_pred, _IteratorTag)
-    { return __search_n(__begin, __end, count, __val, __binary_pred, _IteratorTag()); }
+    inline _FIterator
+    __search_n_switch(_FIterator __begin, _FIterator __end, _Integer count,
+                      const _Tp& __val, _BinaryPredicate __binary_pred,
+                      _IteratorTag)
+    { return __search_n(__begin, __end, count, __val, __binary_pred,
+                        _IteratorTag()); }
 
   // Public interface.
-  template<typename _ForwardIterator, typename _Integer, typename _Tp,
+  template<typename _FIterator, typename _Integer, typename _Tp,
            typename _BinaryPredicate>
-    inline _ForwardIterator
-    search_n(_ForwardIterator __begin, _ForwardIterator __end, _Integer count,
+    inline _FIterator
+    search_n(_FIterator __begin, _FIterator __end, _Integer count,
              const _Tp& __val, _BinaryPredicate __binary_pred)
     {
       return __search_n_switch(__begin, __end, count, __val, __binary_pred,
-                             typename std::iterator_traits<_ForwardIterator>::
+                             typename std::iterator_traits<_FIterator>::
                              iterator_category());
     }
 
@@ -1222,13 +1228,14 @@ 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,
-                                            __gnu_parallel::_DummyReduct(),
-                                            __dummy, __dummy, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              begin_pair, end_pair, unary_op, __functionality,
+              __gnu_parallel::_DummyReduct(),
+              __dummy, __dummy, -1, __parallelism_tag);
           return __functionality._M_finish_iterator;
         }
       else
@@ -1358,9 +1365,10 @@ namespace __parallel
       typedef std::iterator_traits<_OutputIterator> _OIterTraits;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __transform2_switch(__begin1, __end1, __begin2, __result, __binary_op,
-                               _IIterCategory1(), _IIterCategory2(), 
-                               _OIterCategory(), __parallelism_tag);
+      return __transform2_switch(
+               __begin1, __end1, __begin2, __result, __binary_op,
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory(),
+               __parallelism_tag);
     }
 
   template<typename _IIter1, typename _IIter2,
@@ -1379,23 +1387,24 @@ namespace __parallel
       typedef std::iterator_traits<_OutputIterator> _OIterTraits;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __transform2_switch(__begin1, __end1, __begin2, __result, __binary_op,
-                               _IIterCategory1(), _IIterCategory2(),
-                               _OIterCategory());
+      return __transform2_switch(
+               __begin1, __end1, __begin2, __result, __binary_op,
+               _IIterCategory1(), _IIterCategory2(), _OIterCategory());
     }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _Tp>
+  template<typename _FIterator, typename _Tp>
     inline void
-    replace(_ForwardIterator __begin, _ForwardIterator __end, const _Tp& __old_value, 
+    replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value, 
             const _Tp& __new_value, __gnu_parallel::sequential_tag)
     { _GLIBCXX_STD_P::replace(__begin, __end, __old_value, __new_value); }
 
   // Sequential fallback for input iterator case
-  template<typename _ForwardIterator, typename _Tp, typename _IteratorTag>
+  template<typename _FIterator, typename _Tp, typename _IteratorTag>
     inline void
-    __replace_switch(_ForwardIterator __begin, _ForwardIterator __end, 
-                   const _Tp& __old_value, const _Tp& __new_value, _IteratorTag)
+    __replace_switch(_FIterator __begin, _FIterator __end, 
+                     const _Tp& __old_value, const _Tp& __new_value,
+                     _IteratorTag)
     { replace(__begin, __end, __old_value, __new_value, 
               __gnu_parallel::sequential_tag()); }
 
@@ -1414,40 +1423,43 @@ namespace __parallel
     }
 
   // Public interface
-  template<typename _ForwardIterator, typename _Tp>
+  template<typename _FIterator, typename _Tp>
     inline void
-    replace(_ForwardIterator __begin, _ForwardIterator __end, const _Tp& __old_value, 
-            const _Tp& __new_value, __gnu_parallel::_Parallelism __parallelism_tag)
+    replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value, 
+            const _Tp& __new_value,
+            __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
-      __replace_switch(__begin, __end, __old_value, __new_value, _IteratorCategory(), 
+      __replace_switch(__begin, __end, __old_value, __new_value,
+                       _IteratorCategory(),
                      __parallelism_tag);
     }
 
-  template<typename _ForwardIterator, typename _Tp>
+  template<typename _FIterator, typename _Tp>
     inline void
-    replace(_ForwardIterator __begin, _ForwardIterator __end, const _Tp& __old_value, 
+    replace(_FIterator __begin, _FIterator __end, const _Tp& __old_value, 
             const _Tp& __new_value)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
-      __replace_switch(__begin, __end, __old_value, __new_value, _IteratorCategory());
+      __replace_switch(__begin, __end, __old_value, __new_value,
+                       _IteratorCategory());
     }
 
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _Predicate, typename _Tp>
+  template<typename _FIterator, typename _Predicate, typename _Tp>
     inline void
-    replace_if(_ForwardIterator __begin, _ForwardIterator __end, _Predicate __pred, 
+    replace_if(_FIterator __begin, _FIterator __end, _Predicate __pred, 
                const _Tp& __new_value, __gnu_parallel::sequential_tag)
     { _GLIBCXX_STD_P::replace_if(__begin, __end, __pred, __new_value); }
 
   // Sequential fallback for input iterator case
-  template<typename _ForwardIterator, typename _Predicate, typename _Tp,
+  template<typename _FIterator, typename _Predicate, typename _Tp,
            typename _IteratorTag>
     inline void
-    __replace_if_switch(_ForwardIterator __begin, _ForwardIterator __end,
+    __replace_if_switch(_FIterator __begin, _FIterator __end,
                       _Predicate __pred, const _Tp& __new_value, _IteratorTag)
     { replace_if(__begin, __end, __pred, __new_value,
                  __gnu_parallel::sequential_tag()); }
@@ -1471,10 +1483,10 @@ namespace __parallel
             __replace_if_selector<_RAIter, _Predicate, _Tp>
             __functionality(__new_value);
           __gnu_parallel::
-            __for_each_template_random_access(__begin, __end, __pred,
-                                            __functionality,
-                                            __gnu_parallel::_DummyReduct(),
-                                            true, __dummy, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __pred, __functionality,
+              __gnu_parallel::_DummyReduct(),
+              true, __dummy, -1, __parallelism_tag);
         }
       else
         replace_if(__begin, __end, __pred, __new_value, 
@@ -1482,39 +1494,40 @@ namespace __parallel
     }
 
   // Public interface.
-  template<typename _ForwardIterator, typename _Predicate, typename _Tp>
+  template<typename _FIterator, typename _Predicate, typename _Tp>
     inline void
-    replace_if(_ForwardIterator __begin, _ForwardIterator __end,
+    replace_if(_FIterator __begin, _FIterator __end,
                _Predicate __pred, const _Tp& __new_value, 
                __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef std::iterator_traits<_ForwardIterator> _IteratorTraits;
+      typedef std::iterator_traits<_FIterator> _IteratorTraits;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __replace_if_switch(__begin, __end, __pred, __new_value, _IteratorCategory(), 
-                        __parallelism_tag);
+      __replace_if_switch(__begin, __end, __pred, __new_value,
+                          _IteratorCategory(), __parallelism_tag);
     }
 
-  template<typename _ForwardIterator, typename _Predicate, typename _Tp>
+  template<typename _FIterator, typename _Predicate, typename _Tp>
     inline void
-    replace_if(_ForwardIterator __begin, _ForwardIterator __end,
+    replace_if(_FIterator __begin, _FIterator __end,
                _Predicate __pred, const _Tp& __new_value)
     {
-      typedef std::iterator_traits<_ForwardIterator> _IteratorTraits;
+      typedef std::iterator_traits<_FIterator> _IteratorTraits;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __replace_if_switch(__begin, __end, __pred, __new_value, _IteratorCategory());
+      __replace_if_switch(__begin, __end, __pred, __new_value,
+                          _IteratorCategory());
     }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename Generator>
+  template<typename _FIterator, typename Generator>
     inline void
-    generate(_ForwardIterator __begin, _ForwardIterator __end, Generator __gen, 
+    generate(_FIterator __begin, _FIterator __end, Generator __gen, 
              __gnu_parallel::sequential_tag)
     { _GLIBCXX_STD_P::generate(__begin, __end, __gen); }
 
   // Sequential fallback for input iterator case.
-  template<typename _ForwardIterator, typename Generator, typename _IteratorTag>
+  template<typename _FIterator, typename Generator, typename _IteratorTag>
     inline void
-    __generate_switch(_ForwardIterator __begin, _ForwardIterator __end, Generator __gen, 
+    __generate_switch(_FIterator __begin, _FIterator __end, Generator __gen,
                     _IteratorTag)
     { generate(__begin, __end, __gen, __gnu_parallel::sequential_tag()); }
 
@@ -1535,30 +1548,32 @@ namespace __parallel
           __gnu_parallel::__generate_selector<_RAIter>
             __functionality;
           __gnu_parallel::
-            __for_each_template_random_access(__begin, __end, __gen, __functionality,
-                                            __gnu_parallel::_DummyReduct(),
-                                            true, __dummy, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __gen, __functionality,
+              __gnu_parallel::_DummyReduct(),
+              true, __dummy, -1, __parallelism_tag);
         }
       else
         generate(__begin, __end, __gen, __gnu_parallel::sequential_tag());
     }
 
   // Public interface.
-  template<typename _ForwardIterator, typename Generator>
+  template<typename _FIterator, typename Generator>
     inline void
-    generate(_ForwardIterator __begin, _ForwardIterator __end,
+    generate(_FIterator __begin, _FIterator __end,
              Generator __gen, __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef std::iterator_traits<_ForwardIterator> _IteratorTraits;
+      typedef std::iterator_traits<_FIterator> _IteratorTraits;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
-      __generate_switch(__begin, __end, __gen, _IteratorCategory(), __parallelism_tag);
+      __generate_switch(__begin, __end, __gen, _IteratorCategory(),
+                        __parallelism_tag);
     }
 
-  template<typename _ForwardIterator, typename Generator>
+  template<typename _FIterator, typename Generator>
     inline void
-    generate(_ForwardIterator __begin, _ForwardIterator __end, Generator __gen)
+    generate(_FIterator __begin, _FIterator __end, Generator __gen)
     {
-      typedef std::iterator_traits<_ForwardIterator> _IteratorTraits;
+      typedef std::iterator_traits<_FIterator> _IteratorTraits;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
       __generate_switch(__begin, __end, __gen, _IteratorCategory());
     }
@@ -1575,8 +1590,10 @@ namespace __parallel
   template<typename _OutputIterator, typename _Size, typename Generator,
            typename _IteratorTag>
     inline _OutputIterator
-    __generate_n_switch(_OutputIterator __begin, _Size __n, Generator __gen, _IteratorTag)
-    { return generate_n(__begin, __n, __gen, __gnu_parallel::sequential_tag()); }
+    __generate_n_switch(_OutputIterator __begin, _Size __n, Generator __gen,
+                        _IteratorTag)
+    { return generate_n(__begin, __n, __gen,
+                        __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators.
   template<typename _RAIter, typename _Size, typename Generator>
@@ -1587,7 +1604,7 @@ namespace __parallel
                       = __gnu_parallel::parallel_balanced)
     {
       // XXX parallel version is where?
-      return generate_n(__begin, __n, __gen, __gnu_parallel::sequential_tag()); 
+      return generate_n(__begin, __n, __gen, __gnu_parallel::sequential_tag());
     }
 
   // Public interface.
@@ -1623,7 +1640,8 @@ namespace __parallel
   template<typename _RAIter, typename RandomNumberGenerator>
     inline void
     random_shuffle(_RAIter __begin, _RAIter __end, 
-                   RandomNumberGenerator& __rand, __gnu_parallel::sequential_tag)
+                   RandomNumberGenerator& __rand,
+                   __gnu_parallel::sequential_tag)
     { _GLIBCXX_STD_P::random_shuffle(__begin, __end, __rand); }
 
 
@@ -1663,18 +1681,19 @@ namespace __parallel
     }
 
   // Sequential fallback.
-  template<typename _ForwardIterator, typename _Predicate>
-    inline _ForwardIterator
-    partition(_ForwardIterator __begin, _ForwardIterator __end,
+  template<typename _FIterator, typename _Predicate>
+    inline _FIterator
+    partition(_FIterator __begin, _FIterator __end,
               _Predicate __pred, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::partition(__begin, __end, __pred); }
 
   // Sequential fallback for input iterator case.
-  template<typename _ForwardIterator, typename _Predicate, typename _IteratorTag>
-    inline _ForwardIterator
-    __partition_switch(_ForwardIterator __begin, _ForwardIterator __end,
+  template<typename _FIterator, typename _Predicate, typename _IteratorTag>
+    inline _FIterator
+    __partition_switch(_FIterator __begin, _FIterator __end,
                      _Predicate __pred, _IteratorTag)
-    { return partition(__begin, __end, __pred, __gnu_parallel::sequential_tag()); }
+    { return partition(__begin, __end, __pred,
+                       __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators.
   template<typename _RAIter, typename _Predicate>
@@ -1694,15 +1713,16 @@ namespace __parallel
           return __begin + __middle;
         }
       else
-        return partition(__begin, __end, __pred, __gnu_parallel::sequential_tag());
+        return partition(__begin, __end, __pred,
+                         __gnu_parallel::sequential_tag());
     }
 
   // Public interface.
-  template<typename _ForwardIterator, typename _Predicate>
-    inline _ForwardIterator
-    partition(_ForwardIterator __begin, _ForwardIterator __end, _Predicate __pred)
+  template<typename _FIterator, typename _Predicate>
+    inline _FIterator
+    partition(_FIterator __begin, _FIterator __end, _Predicate __pred)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
       return __partition_switch(__begin, __end, __pred, _IteratorCategory());
     }
@@ -1739,7 +1759,8 @@ namespace __parallel
         if (_GLIBCXX_PARALLEL_CONDITION(
             static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
               __gnu_parallel::_Settings::get().sort_minimal_n))
-          __gnu_parallel::parallel_sort<false>(__begin, __end, __comp, __parallelism);
+          __gnu_parallel::parallel_sort<false>(
+                            __begin, __end, __comp, __parallelism);
         else
           sort(__begin, __end, __comp, __gnu_parallel::sequential_tag());
       }
@@ -1877,9 +1898,11 @@ namespace __parallel
         if (_GLIBCXX_PARALLEL_CONDITION(
               static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
               __gnu_parallel::_Settings::get().sort_minimal_n))
-          __gnu_parallel::parallel_sort<true>(__begin, __end, __comp, __parallelism);
+          __gnu_parallel::parallel_sort<true>(
+                            __begin, __end, __comp, __parallelism);
         else
-          stable_sort(__begin, __end, __comp, __gnu_parallel::sequential_tag());
+          stable_sort(__begin, __end, __comp,
+                      __gnu_parallel::sequential_tag());
       }
   }
 
@@ -1957,51 +1980,10 @@ namespace __parallel
   {
     typedef iterator_traits<_RAIter> _TraitsType;
     typedef typename _TraitsType::value_type _ValueType;
-    stable_sort(__begin, __end, __comp, __gnu_parallel::default_parallel_tag());
+    stable_sort(
+      __begin, __end, __comp, __gnu_parallel::default_parallel_tag());
   }
 
-
-//   // Sequential fallback
-//   template<typename _RAIter>
-//   inline void
-//   stable_sort(_RAIter __begin, _RAIter __end, 
-//            __gnu_parallel::sequential_tag)
-//   { return _GLIBCXX_STD_P::stable_sort(__begin, __end); }
-// 
-//   // Sequential fallback
-//   template<typename _RAIter, typename _Compare>
-//   inline void
-//   stable_sort(_RAIter __begin, _RAIter __end, 
-//            _Compare __comp, __gnu_parallel::sequential_tag)
-//   { return _GLIBCXX_STD_P::stable_sort(__begin, __end, __comp); }
-// 
-//   template<typename _RAIter>
-//   void
-//   stable_sort(_RAIter __begin, _RAIter __end)
-//   {
-//     typedef iterator_traits<_RAIter> _TraitsType;
-//     typedef typename _TraitsType::value_type _ValueType;
-//     stable_sort(__begin, __end, std::less<_ValueType>());
-//   }
-// 
-//   // Parallel algorithm for random access iterators
-//   template<typename _RAIter, typename _Compare>
-//   void
-//   stable_sort(_RAIter __begin, _RAIter __end, 
-//            _Compare __comp)
-//   {
-//     if (__begin != __end)
-//       {
-//      if (_GLIBCXX_PARALLEL_CONDITION(
-//            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin) >=
-//                __gnu_parallel::_Settings::get().sort_minimal_n))
-//        __gnu_parallel::parallel_sort(__begin, __end, __comp,
-//                                      __gnu_parallel::parallel_tag());
-//      else
-//        stable_sort(__begin, __end, __comp, __gnu_parallel::sequential_tag());
-//       }
-//   }
-
   // Sequential fallback
   template<typename _IIter1, typename _IIter2,
            typename _OutputIterator>
@@ -2009,7 +1991,8 @@ namespace __parallel
     merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
           _IIter2 __end2, _OutputIterator __result,
           __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::merge(__begin1, __end1, __begin2, __end2, __result); }
+    { return _GLIBCXX_STD_P::merge(
+               __begin1, __end1, __begin2, __end2, __result); }
 
   // Sequential fallback
   template<typename _IIter1, typename _IIter2,
@@ -2018,12 +2001,13 @@ namespace __parallel
     merge(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
           _IIter2 __end2, _OutputIterator __result, _Compare __comp,
           __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::merge(__begin1, __end1, __begin2, __end2, __result, __comp); }
+    { return _GLIBCXX_STD_P::merge(
+                __begin1, __end1, __begin2, __end2, __result, __comp); }
 
   // Sequential fallback for input iterator case
-  template<typename _IIter1, typename _IIter2,
-           typename _OutputIterator, typename _Compare,
-           typename _IteratorTag1, typename _IteratorTag2, typename _IteratorTag3>
+  template<typename _IIter1, typename _IIter2, typename _OutputIterator,
+           typename _Compare, typename _IteratorTag1,
+           typename _IteratorTag2, typename _IteratorTag3>
     inline _OutputIterator
     __merge_switch(_IIter1 __begin1, _IIter1 __end1,
                  _IIter2 __begin2, _IIter2 __end2,
@@ -2047,14 +2031,13 @@ namespace __parallel
              >= __gnu_parallel::_Settings::get().merge_minimal_n
              || static_cast<__gnu_parallel::_SequenceIndex>(__end2 - __begin2)
              >= __gnu_parallel::_Settings::get().merge_minimal_n)))
-        return __gnu_parallel::__parallel_merge_advance(__begin1, __end1,
-                                                      __begin2, __end2,
-                                                      __result, (__end1 - __begin1)
-                                                      + (__end2 - __begin2), __comp);
+        return __gnu_parallel::__parallel_merge_advance(
+                 __begin1, __end1, __begin2, __end2, __result,
+                 (__end1 - __begin1) + (__end2 - __begin2), __comp);
       else
-        return __gnu_parallel::__merge_advance(__begin1, __end1, __begin2, __end2,
-                                             __result, (__end1 - __begin1)
-                                             + (__end2 - __begin2), __comp);
+        return __gnu_parallel::__merge_advance(
+                 __begin1, __end1, __begin2, __end2, __result,
+                 (__end1 - __begin1) + (__end2 - __begin2), __comp);
   }
 
   // Public interface
@@ -2075,9 +2058,9 @@ namespace __parallel
         _IIterCategory2;
       typedef typename _OIterTraits::iterator_category _OIterCategory;
 
-      return __merge_switch(__begin1, __end1, __begin2, __end2, __result, __comp, 
-                          _IIterCategory1(), _IIterCategory2(), 
-                          _OIterCategory());
+      return __merge_switch(
+              __begin1, __end1, __begin2, __end2, __result, __comp,
+              _IIterCategory1(), _IIterCategory2(), _OIterCategory());
   }
 
 
@@ -2123,7 +2106,8 @@ namespace __parallel
             >= __gnu_parallel::_Settings::get().nth_element_minimal_n))
         __gnu_parallel::parallel_nth_element(__begin, __nth, __end, __comp);
       else
-        nth_element(__begin, __nth, __end, __comp, __gnu_parallel::sequential_tag());
+        nth_element(__begin, __nth, __end, __comp,
+                    __gnu_parallel::sequential_tag());
     }
 
   // Public interface, insert default comparator
@@ -2161,7 +2145,8 @@ namespace __parallel
       if (_GLIBCXX_PARALLEL_CONDITION(
             static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
             >= __gnu_parallel::_Settings::get().partial_sort_minimal_n))
-        __gnu_parallel::parallel_partial_sort(__begin, __middle, __end, __comp);
+        __gnu_parallel::
+          parallel_partial_sort(__begin, __middle, __end, __comp);
       else
         partial_sort(__begin, __middle, __end, __comp,
                      __gnu_parallel::sequential_tag());
@@ -2179,25 +2164,26 @@ namespace __parallel
     }
 
   // Sequential fallback
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    max_element(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator>
+    inline _FIterator
+    max_element(_FIterator __begin, _FIterator __end, 
                 __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::max_element(__begin, __end); }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    max_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp, 
+  template<typename _FIterator, typename _Compare>
+    inline _FIterator
+    max_element(_FIterator __begin, _FIterator __end, _Compare __comp, 
                 __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::max_element(__begin, __end, __comp); }
 
   // Sequential fallback for input iterator case
-  template<typename _ForwardIterator, typename _Compare, typename _IteratorTag>
-    inline _ForwardIterator
-    __max_element_switch(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator, typename _Compare, typename _IteratorTag>
+    inline _FIterator
+    __max_element_switch(_FIterator __begin, _FIterator __end, 
                        _Compare __comp, _IteratorTag)
-    { return max_element(__begin, __end, __comp, __gnu_parallel::sequential_tag()); }
+    { return max_element(__begin, __end, __comp,
+                         __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators
   template<typename _RAIter, typename _Compare>
@@ -2216,79 +2202,79 @@ namespace __parallel
           __gnu_parallel::__identity_selector<_RAIter>
             __functionality;
           __gnu_parallel::
-            __for_each_template_random_access(__begin, __end,
-                                            __gnu_parallel::_Nothing(),
-                                            __functionality,
-                                            __gnu_parallel::
-                                            __max_element_reduct<_Compare,
-                                            _RAIter>(__comp),
-                                            __res, __res, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __gnu_parallel::_Nothing(), __functionality,
+              __gnu_parallel::__max_element_reduct<_Compare, _RAIter>(__comp),
+              __res, __res, -1, __parallelism_tag);
           return __res;
         }
       else
-        return max_element(__begin, __end, __comp, __gnu_parallel::sequential_tag());
+        return max_element(__begin, __end, __comp,
+                           __gnu_parallel::sequential_tag());
     }
 
   // Public interface, insert default comparator
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    max_element(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator>
+    inline _FIterator
+    max_element(_FIterator __begin, _FIterator __end, 
                 __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
-      return max_element(__begin, __end, std::less<_ValueType>(), __parallelism_tag);
+      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
+      return max_element(__begin, __end, std::less<_ValueType>(),
+                         __parallelism_tag);
     }
 
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    max_element(_ForwardIterator __begin, _ForwardIterator __end)
+  template<typename _FIterator>
+    inline _FIterator
+    max_element(_FIterator __begin, _FIterator __end)
     {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
+      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
       return max_element(__begin, __end, std::less<_ValueType>());
     }
 
   // Public interface
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    max_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp,
+  template<typename _FIterator, typename _Compare>
+    inline _FIterator
+    max_element(_FIterator __begin, _FIterator __end, _Compare __comp,
                 __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
       return __max_element_switch(__begin, __end, __comp, _IteratorCategory(), 
-                                __parallelism_tag);
+                                  __parallelism_tag);
     }
 
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    max_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp)
+  template<typename _FIterator, typename _Compare>
+    inline _FIterator
+    max_element(_FIterator __begin, _FIterator __end, _Compare __comp)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
       return __max_element_switch(__begin, __end, __comp, _IteratorCategory());
     }
 
 
   // Sequential fallback
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    min_element(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator>
+    inline _FIterator
+    min_element(_FIterator __begin, _FIterator __end, 
                 __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::min_element(__begin, __end); }
 
   // Sequential fallback
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    min_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp, 
+  template<typename _FIterator, typename _Compare>
+    inline _FIterator
+    min_element(_FIterator __begin, _FIterator __end, _Compare __comp, 
                 __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::min_element(__begin, __end, __comp); }
 
   // Sequential fallback for input iterator case
-  template<typename _ForwardIterator, typename _Compare, typename _IteratorTag>
-    inline _ForwardIterator
-    __min_element_switch(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator, typename _Compare, typename _IteratorTag>
+    inline _FIterator
+    __min_element_switch(_FIterator __begin, _FIterator __end, 
                        _Compare __comp, _IteratorTag)
-    { return min_element(__begin, __end, __comp, __gnu_parallel::sequential_tag()); }
+    { return min_element(__begin, __end, __comp,
+                         __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators
   template<typename _RAIter, typename _Compare>
@@ -2307,54 +2293,53 @@ namespace __parallel
           __gnu_parallel::__identity_selector<_RAIter>
             __functionality;
           __gnu_parallel::
-            __for_each_template_random_access(__begin, __end,
-                                            __gnu_parallel::_Nothing(),
-                                            __functionality,
-                                            __gnu_parallel::
-                                            __min_element_reduct<_Compare,
-                                            _RAIter>(__comp),
-                                            __res, __res, -1, __parallelism_tag);
+            __for_each_template_random_access(
+              __begin, __end, __gnu_parallel::_Nothing(), __functionality,
+              __gnu_parallel::__min_element_reduct<_Compare, _RAIter>(__comp),
+              __res, __res, -1, __parallelism_tag);
           return __res;
         }
       else
-        return min_element(__begin, __end, __comp, __gnu_parallel::sequential_tag());
+        return min_element(__begin, __end, __comp,
+                           __gnu_parallel::sequential_tag());
     }
 
   // Public interface, insert default comparator
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    min_element(_ForwardIterator __begin, _ForwardIterator __end, 
+  template<typename _FIterator>
+    inline _FIterator
+    min_element(_FIterator __begin, _FIterator __end, 
                 __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
-      return min_element(__begin, __end, std::less<_ValueType>(), __parallelism_tag);
+      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
+      return min_element(__begin, __end, std::less<_ValueType>(),
+                         __parallelism_tag);
     }
 
-  template<typename _ForwardIterator>
-    inline _ForwardIterator
-    min_element(_ForwardIterator __begin, _ForwardIterator __end)
+  template<typename _FIterator>
+    inline _FIterator
+    min_element(_FIterator __begin, _FIterator __end)
     {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
+      typedef typename iterator_traits<_FIterator>::value_type _ValueType;
       return min_element(__begin, __end, std::less<_ValueType>());
     }
 
   // Public interface
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    min_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp,
+  template<typename _FIterator, typename _Compare>
+    inline _FIterator
+    min_element(_FIterator __begin, _FIterator __end, _Compare __comp,
                 __gnu_parallel::_Parallelism __parallelism_tag)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
       return __min_element_switch(__begin, __end, __comp, _IteratorCategory(), 
                                 __parallelism_tag);
     }
 
-  template<typename _ForwardIterator, typename _Compare>
-    inline _ForwardIterator
-    min_element(_ForwardIterator __begin, _ForwardIterator __end, _Compare __comp)
+  template<typename _FIterator, typename _Compare>
+    inline _FIterator
+    min_element(_FIterator __begin, _FIterator __end, _Compare __comp)
     {
-      typedef iterator_traits<_ForwardIterator> _TraitsType;
+      typedef iterator_traits<_FIterator> _TraitsType;
       typedef typename _TraitsType::iterator_category _IteratorCategory;
       return __min_element_switch(__begin, __end, __comp, _IteratorCategory());
     }
diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h
index b50068d2967..b0571a47933 100644
--- a/libstdc++-v3/include/parallel/algobase.h
+++ b/libstdc++-v3/include/parallel/algobase.h
@@ -53,44 +53,41 @@ namespace __parallel
   template<typename _IIter1, typename _IIter2>
     inline pair<_IIter1, _IIter2>
     mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-	     __gnu_parallel::sequential_tag)
+             __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2); }
 
   // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-	   typename _Predicate>
+  template<typename _IIter1, typename _IIter2, typename _Predicate>
     inline pair<_IIter1, _IIter2>
     mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-	     _Predicate __pred, __gnu_parallel::sequential_tag)
+             _Predicate __pred, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2, __pred); }
 
   // Sequential fallback for input iterator case
   template<typename _IIter1, typename _IIter2,
-	   typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
+           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
     inline pair<_IIter1, _IIter2>
-    __mismatch_switch(_IIter1 __begin1, _IIter1 __end1, 
-		    _IIter2 __begin2, _Predicate __pred, _IteratorTag1, 
-		    _IteratorTag2)
+    __mismatch_switch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
+                      _Predicate __pred, _IteratorTag1, _IteratorTag2)
     { return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2, __pred); }
 
   // Parallel mismatch for random access iterators
-  template<typename _RAIter1, typename _RAIter2,
-	   typename _Predicate>
+  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
     pair<_RAIter1, _RAIter2>
     __mismatch_switch(_RAIter1 __begin1, _RAIter1 __end1,
-		    _RAIter2 __begin2, _Predicate __pred, 
-		    random_access_iterator_tag, random_access_iterator_tag)
+                      _RAIter2 __begin2, _Predicate __pred, 
+                      random_access_iterator_tag, random_access_iterator_tag)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(true))
-	{
-	  _RAIter1 __res =
-	    __gnu_parallel::__find_template(__begin1, __end1, __begin2, __pred,
-					  __gnu_parallel::
-					  __mismatch_selector()).first;
-	  return make_pair(__res , __begin2 + (__res - __begin1));
-	}
+        {
+          _RAIter1 __res =
+            __gnu_parallel::__find_template(__begin1, __end1, __begin2, __pred,
+                                            __gnu_parallel::
+                                            __mismatch_selector()).first;
+          return make_pair(__res , __begin2 + (__res - __begin1));
+        }
       else
-	return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2, __pred);
+        return _GLIBCXX_STD_P::mismatch(__begin1, __end1, __begin2, __pred);
     }
 
   // Public interface
@@ -108,38 +105,36 @@ namespace __parallel
       typedef __gnu_parallel::equal_to<_ValueType1, _ValueType2> equal_to_type;
 
       return __mismatch_switch(__begin1, __end1, __begin2, equal_to_type(),
-			     _IteratorCategory1(), _IteratorCategory2());
+                               _IteratorCategory1(), _IteratorCategory2());
     }
 
   // Public interface
-  template<typename _IIter1, typename _IIter2,
-	   typename _Predicate>
+  template<typename _IIter1, typename _IIter2, typename _Predicate>
     inline pair<_IIter1, _IIter2>
     mismatch(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2,
-	     _Predicate __pred)
+             _Predicate __pred)
     {
       typedef std::iterator_traits<_IIter1> iterator1_traits;
       typedef std::iterator_traits<_IIter2> iterator2_traits;
       typedef typename iterator1_traits::iterator_category _IteratorCategory1;
       typedef typename iterator2_traits::iterator_category _IteratorCategory2;
 
-      return __mismatch_switch(__begin1, __end1, __begin2, __pred, _IteratorCategory1(), 
-			     _IteratorCategory2());
+      return __mismatch_switch(__begin1, __end1, __begin2, __pred,
+                               _IteratorCategory1(), _IteratorCategory2());
     }
 
   // Sequential fallback
   template<typename _IIter1, typename _IIter2>
     inline bool
     equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-	  __gnu_parallel::sequential_tag)
+          __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::equal(__begin1, __end1, __begin2); }
 
   // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-	   typename _Predicate>
+  template<typename _IIter1, typename _IIter2, typename _Predicate>
     inline bool
     equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-	  _Predicate __pred, __gnu_parallel::sequential_tag)
+          _Predicate __pred, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::equal(__begin1, __end1, __begin2, __pred); }
 
   // Public interface
@@ -149,99 +144,97 @@ namespace __parallel
     { return mismatch(__begin1, __end1, __begin2).first == __end1; }
 
   // Public interface
-  template<typename _IIter1, typename _IIter2,
-	   typename _Predicate>
+  template<typename _IIter1, typename _IIter2, typename _Predicate>
     inline bool
     equal(_IIter1 __begin1, _IIter1 __end1, _IIter2 __begin2, 
-	  _Predicate __pred)
+          _Predicate __pred)
     { return mismatch(__begin1, __end1, __begin2, __pred).first == __end1; }
 
   // Sequential fallback
   template<typename _IIter1, typename _IIter2>
     inline bool
     lexicographical_compare(_IIter1 __begin1, _IIter1 __end1, 
-			    _IIter2 __begin2, _IIter2 __end2, 
-			    __gnu_parallel::sequential_tag)
+                            _IIter2 __begin2, _IIter2 __end2, 
+                            __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1,
-						     __begin2, __end2); }
+                                                     __begin2, __end2); }
 
   // Sequential fallback
-  template<typename _IIter1, typename _IIter2,
-	   typename _Predicate>
+  template<typename _IIter1, typename _IIter2, typename _Predicate>
     inline bool
     lexicographical_compare(_IIter1 __begin1, _IIter1 __end1, 
-			    _IIter2 __begin2, _IIter2 __end2, 
-			    _Predicate __pred, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1, 
-						     __begin2, __end2, __pred); }
+                            _IIter2 __begin2, _IIter2 __end2, 
+                            _Predicate __pred, __gnu_parallel::sequential_tag)
+    { return _GLIBCXX_STD_P::lexicographical_compare(
+               __begin1, __end1, __begin2, __end2, __pred); }
 
   // Sequential fallback for input iterator case
   template<typename _IIter1, typename _IIter2,
-	   typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
+           typename _Predicate, typename _IteratorTag1, typename _IteratorTag2>
     inline bool
-    __lexicographical_compare_switch(_IIter1 __begin1, _IIter1 __end1, 
-				   _IIter2 __begin2, _IIter2 __end2, 
-				   _Predicate __pred, _IteratorTag1, _IteratorTag2)
-    { return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1, 
-						     __begin2, __end2, __pred); }
+    __lexicographical_compare_switch(_IIter1 __begin1, _IIter1 __end1,
+                                     _IIter2 __begin2, _IIter2 __end2, 
+                                     _Predicate __pred,
+                                     _IteratorTag1, _IteratorTag2)
+    { return _GLIBCXX_STD_P::lexicographical_compare(
+               __begin1, __end1, __begin2, __end2, __pred); }
 
   // Parallel lexicographical_compare for random access iterators
   // Limitation: Both valuetypes must be the same
-  template<typename _RAIter1, typename _RAIter2,
-	   typename _Predicate>
+  template<typename _RAIter1, typename _RAIter2, typename _Predicate>
     bool
-    __lexicographical_compare_switch(_RAIter1 __begin1, 
-				   _RAIter1 __end1, 
-				   _RAIter2 __begin2, 
-				   _RAIter2 __end2, _Predicate __pred, 
-				   random_access_iterator_tag, 
-				   random_access_iterator_tag)
+    __lexicographical_compare_switch(_RAIter1 __begin1, _RAIter1 __end1,
+                                     _RAIter2 __begin2, _RAIter2 __end2,
+                                     _Predicate __pred,
+                                     random_access_iterator_tag, 
+                                     random_access_iterator_tag)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(true))
-	{
-	  typedef iterator_traits<_RAIter1> _TraitsType1;
-	  typedef typename _TraitsType1::value_type _ValueType1;
-
-	  typedef iterator_traits<_RAIter2> _TraitsType2;
-	  typedef typename _TraitsType2::value_type _ValueType2;
-
-	  typedef __gnu_parallel::_EqualFromLess<_Predicate, _ValueType1,
-	                                          _ValueType2> _EqualFromLessCompare;
-
-	  // Longer sequence in first place.
-	  if ((__end1 - __begin1) < (__end2 - __begin2))
-	    {
-	      typedef pair<_RAIter1, _RAIter2>
-		_SpotType;
-	      _SpotType __mm = __mismatch_switch(__begin1, __end1, __begin2, 
-					     _EqualFromLessCompare(__pred), 
-					     random_access_iterator_tag(), 
-					     random_access_iterator_tag());
-
-	      return (__mm.first == __end1) || bool(__pred(*__mm.first, *__mm.second));
-	    }
-	  else
-	    {
-	      typedef pair<_RAIter2, _RAIter1>
-		_SpotType;
-	      _SpotType __mm = __mismatch_switch(__begin2, __end2, __begin1, 
-					     _EqualFromLessCompare(__pred), 
-					     random_access_iterator_tag(), 
-					     random_access_iterator_tag());
-
-	      return (__mm.first != __end2) && bool(__pred(*__mm.second, *__mm.first));
-	    }
-	}
+        {
+          typedef iterator_traits<_RAIter1> _TraitsType1;
+          typedef typename _TraitsType1::value_type _ValueType1;
+
+          typedef iterator_traits<_RAIter2> _TraitsType2;
+          typedef typename _TraitsType2::value_type _ValueType2;
+
+          typedef __gnu_parallel::
+                  _EqualFromLess<_Predicate, _ValueType1, _ValueType2>
+                  _EqualFromLessCompare;
+
+          // Longer sequence in first place.
+          if ((__end1 - __begin1) < (__end2 - __begin2))
+            {
+              typedef pair<_RAIter1, _RAIter2> _SpotType;
+              _SpotType __mm = __mismatch_switch(__begin1, __end1, __begin2, 
+                                             _EqualFromLessCompare(__pred), 
+                                             random_access_iterator_tag(), 
+                                             random_access_iterator_tag());
+
+              return (__mm.first == __end1)
+                        || bool(__pred(*__mm.first, *__mm.second));
+            }
+          else
+            {
+              typedef pair<_RAIter2, _RAIter1> _SpotType;
+              _SpotType __mm = __mismatch_switch(__begin2, __end2, __begin1, 
+                                             _EqualFromLessCompare(__pred), 
+                                             random_access_iterator_tag(), 
+                                             random_access_iterator_tag());
+
+              return (__mm.first != __end2)
+                        && bool(__pred(*__mm.second, *__mm.first));
+            }
+        }
       else
-	return _GLIBCXX_STD_P::lexicographical_compare(__begin1, __end1,
-						       __begin2, __end2, __pred);
+        return _GLIBCXX_STD_P::lexicographical_compare(
+                 __begin1, __end1, __begin2, __end2, __pred);
     }
 
   // Public interface
   template<typename _IIter1, typename _IIter2>
     inline bool
     lexicographical_compare(_IIter1 __begin1, _IIter1 __end1,
-			    _IIter2 __begin2, _IIter2 __end2)
+                            _IIter2 __begin2, _IIter2 __end2)
     {
       typedef iterator_traits<_IIter1> _TraitsType1;
       typedef typename _TraitsType1::value_type _ValueType1;
@@ -252,18 +245,17 @@ namespace __parallel
       typedef typename _TraitsType2::iterator_category _IteratorCategory2;
       typedef __gnu_parallel::_Less<_ValueType1, _ValueType2> _LessType;
 
-      return __lexicographical_compare_switch(__begin1, __end1, __begin2, __end2, 
-					    _LessType(), _IteratorCategory1(), 
-					    _IteratorCategory2());
+      return __lexicographical_compare_switch(
+               __begin1, __end1, __begin2, __end2, _LessType(),
+               _IteratorCategory1(), _IteratorCategory2());
     }
 
   // Public interface
-  template<typename _IIter1, typename _IIter2,
-	   typename _Predicate>
+  template<typename _IIter1, typename _IIter2, typename _Predicate>
     inline bool
     lexicographical_compare(_IIter1 __begin1, _IIter1 __end1,
-			    _IIter2 __begin2, _IIter2 __end2,
-			    _Predicate __pred)
+                            _IIter2 __begin2, _IIter2 __end2,
+                            _Predicate __pred)
     {
       typedef iterator_traits<_IIter1> _TraitsType1;
       typedef typename _TraitsType1::iterator_category _IteratorCategory1;
@@ -271,9 +263,9 @@ namespace __parallel
       typedef iterator_traits<_IIter2> _TraitsType2;
       typedef typename _TraitsType2::iterator_category _IteratorCategory2;
 
-      return __lexicographical_compare_switch(__begin1, __end1, __begin2, __end2, __pred, 
-					    _IteratorCategory1(), 
-					    _IteratorCategory2());
+      return __lexicographical_compare_switch(
+               __begin1, __end1, __begin2, __end2, __pred,
+               _IteratorCategory1(), _IteratorCategory2());
     }
 } // end namespace
 } // end namespace
diff --git a/libstdc++-v3/include/parallel/algorithmfwd.h b/libstdc++-v3/include/parallel/algorithmfwd.h
index c85959ecf64..5c93615da26 100644
--- a/libstdc++-v3/include/parallel/algorithmfwd.h
+++ b/libstdc++-v3/include/parallel/algorithmfwd.h
@@ -62,7 +62,7 @@ namespace __parallel
   template<typename _FIter, typename _BiPredicate>
     _FIter
     adjacent_find(_FIter, _FIter, _BiPredicate,
-		  __gnu_parallel::sequential_tag);
+                  __gnu_parallel::sequential_tag);
 
   template<typename _FIter, typename _BiPredicate, typename _IterTag>
     _FIter
@@ -71,7 +71,7 @@ namespace __parallel
   template<typename _RAIter, typename _BiPredicate>
     _RAIter
     __adjacent_find_switch(_RAIter, _RAIter, _BiPredicate, 
-			 random_access_iterator_tag);
+                         random_access_iterator_tag);
 
 
   template<typename _IIter, typename _Tp>
@@ -93,8 +93,8 @@ namespace __parallel
   template<typename _RAIter, typename _Tp>
     typename iterator_traits<_RAIter>::difference_type
     __count_switch(_RAIter, _RAIter, const _Tp&, random_access_iterator_tag,
-		 __gnu_parallel::_Parallelism __parallelism
-		 = __gnu_parallel::parallel_unbalanced);
+                 __gnu_parallel::_Parallelism __parallelism
+                 = __gnu_parallel::parallel_unbalanced);
 
 
   template<typename _IIter, typename _Predicate>
@@ -116,8 +116,8 @@ namespace __parallel
   template<typename _RAIter, typename _Predicate>
     typename iterator_traits<_RAIter>::difference_type
     __count_if_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag,
-		    __gnu_parallel::_Parallelism __parallelism
-		    = __gnu_parallel::parallel_unbalanced);
+                    __gnu_parallel::_Parallelism __parallelism
+                    = __gnu_parallel::parallel_unbalanced);
 
   // algobase.h
   template<typename _IIter1, typename _IIter2>
@@ -127,7 +127,7 @@ namespace __parallel
   template<typename _IIter1, typename _IIter2, typename _Predicate>
     bool
     equal(_IIter1, _IIter1, _IIter2, _Predicate,
-	  __gnu_parallel::sequential_tag);
+          __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2>
     bool
@@ -172,12 +172,12 @@ namespace __parallel
   template<typename _IIter, typename _FIter>
     _IIter
     find_first_of(_IIter, _IIter, _FIter, _FIter,
-		  __gnu_parallel::sequential_tag);
+                  __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _FIter, typename _BiPredicate>
     _IIter
     find_first_of(_IIter, _IIter, _FIter, _FIter, _BiPredicate,
-		  __gnu_parallel::sequential_tag);
+                  __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _FIter, typename _BiPredicate>
     _IIter
@@ -188,21 +188,22 @@ namespace __parallel
     find_first_of(_IIter, _IIter, _FIter, _FIter);
 
   template<typename _IIter, typename _FIter,
-	   typename _IterTag1, typename _IterTag2>
+           typename _IterTag1, typename _IterTag2>
     _IIter
-    __find_first_of_switch(_IIter, _IIter, _FIter, _FIter, _IterTag1, _IterTag2);
+    __find_first_of_switch(
+      _IIter, _IIter, _FIter, _FIter, _IterTag1, _IterTag2);
 
   template<typename _RAIter, typename _FIter, typename _BiPredicate,
-	   typename _IterTag>
+           typename _IterTag>
     _RAIter
     __find_first_of_switch(_RAIter, _RAIter, _FIter, _FIter, _BiPredicate,
-			 random_access_iterator_tag, _IterTag);
+                         random_access_iterator_tag, _IterTag);
 
   template<typename _IIter, typename _FIter, typename _BiPredicate,
-	   typename _IterTag1, typename _IterTag2>
+           typename _IterTag1, typename _IterTag2>
     _IIter
     __find_first_of_switch(_IIter, _IIter, _FIter, _FIter, _BiPredicate,
-			 _IterTag1, _IterTag2);
+                         _IterTag1, _IterTag2);
 
 
   template<typename _IIter, typename _Function>
@@ -223,9 +224,9 @@ namespace __parallel
 
   template<typename _RAIter, typename _Function>
     _Function
-    __for_each_switch(_RAIter, _RAIter, _Function, random_access_iterator_tag, 
-		    __gnu_parallel::_Parallelism  __parallelism
-		    = __gnu_parallel::parallel_balanced);
+    __for_each_switch(_RAIter, _RAIter, _Function, random_access_iterator_tag,
+                    __gnu_parallel::_Parallelism  __parallelism
+                    = __gnu_parallel::parallel_balanced);
 
 
   template<typename _FIter, typename _Generator>
@@ -246,9 +247,9 @@ namespace __parallel
 
   template<typename _RAIter, typename _Generator>
     void
-    __generate_switch(_RAIter, _RAIter, _Generator, random_access_iterator_tag, 
-		    __gnu_parallel::_Parallelism __parallelism
-		    = __gnu_parallel::parallel_balanced);
+    __generate_switch(_RAIter, _RAIter, _Generator, random_access_iterator_tag,
+                    __gnu_parallel::_Parallelism __parallelism
+                    = __gnu_parallel::parallel_balanced);
 
   template<typename _OIter, typename _Size, typename _Generator>
     _OIter
@@ -263,25 +264,25 @@ namespace __parallel
     generate_n(_OIter, _Size, _Generator, __gnu_parallel::_Parallelism);
 
   template<typename _OIter, typename _Size, typename _Generator,
-	   typename _IterTag>
+           typename _IterTag>
     _OIter
     __generate_n_switch(_OIter, _Size, _Generator, _IterTag);
 
   template<typename _RAIter, typename _Size, typename _Generator>
     _RAIter
-    __generate_n_switch(_RAIter, _Size, _Generator, random_access_iterator_tag, 
-		      __gnu_parallel::_Parallelism __parallelism
-		      = __gnu_parallel::parallel_balanced);
+    __generate_n_switch(_RAIter, _Size, _Generator, random_access_iterator_tag,
+                      __gnu_parallel::_Parallelism __parallelism
+                      = __gnu_parallel::parallel_balanced);
 
   template<typename _IIter1, typename _IIter2>
     bool
     lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2,
-			    __gnu_parallel::sequential_tag);
+                            __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _Predicate>
     bool
     lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2, _Predicate,
-			    __gnu_parallel::sequential_tag);
+                            __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2>
     bool
@@ -292,16 +293,16 @@ namespace __parallel
     lexicographical_compare(_IIter1, _IIter1, _IIter2, _IIter2, _Predicate);
 
   template<typename _IIter1, typename _IIter2,
-	   typename _Predicate, typename _IterTag1, typename _IterTag2>
+           typename _Predicate, typename _IterTag1, typename _IterTag2>
     bool
     __lexicographical_compare_switch(_IIter1, _IIter1, _IIter2, _IIter2,
-				   _Predicate, _IterTag1, _IterTag2);
+                                   _Predicate, _IterTag1, _IterTag2);
 
   template<typename _RAIter1, typename _RAIter2, typename _Predicate>
     bool
     __lexicographical_compare_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-				   _Predicate, random_access_iterator_tag,
-				   random_access_iterator_tag);
+                                   _Predicate, random_access_iterator_tag,
+                                   random_access_iterator_tag);
 
   // algo.h
   template<typename _IIter1, typename _IIter2>
@@ -311,7 +312,7 @@ namespace __parallel
   template<typename _IIter1, typename _IIter2, typename _Predicate>
     pair<_IIter1, _IIter2>
     mismatch(_IIter1, _IIter1, _IIter2, _Predicate,
-	     __gnu_parallel::sequential_tag);
+             __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2>
     pair<_IIter1, _IIter2>
@@ -322,15 +323,15 @@ namespace __parallel
     mismatch(_IIter1, _IIter1, _IIter2, _Predicate);
 
   template<typename _IIter1, typename _IIter2, typename _Predicate,
-	   typename _IterTag1, typename _IterTag2>
+           typename _IterTag1, typename _IterTag2>
     pair<_IIter1, _IIter2>
     __mismatch_switch(_IIter1, _IIter1, _IIter2, _Predicate,
-		    _IterTag1, _IterTag2);
+                    _IterTag1, _IterTag2);
 
   template<typename _RAIter1, typename _RAIter2, typename _Predicate>
     pair<_RAIter1, _RAIter2>
     __mismatch_switch(_RAIter1, _RAIter1, _RAIter2, _Predicate,
-		    random_access_iterator_tag, random_access_iterator_tag);
+                    random_access_iterator_tag, random_access_iterator_tag);
 
   template<typename _FIter1, typename _FIter2>
     _FIter1
@@ -343,7 +344,7 @@ namespace __parallel
   template<typename _FIter1, typename _FIter2, typename _BiPredicate>
     _FIter1
     search(_FIter1, _FIter1, _FIter2, _FIter2, _BiPredicate,
-	   __gnu_parallel::sequential_tag);
+           __gnu_parallel::sequential_tag);
 
   template<typename _FIter1, typename _FIter2, typename _BiPredicate>
     _FIter1
@@ -352,55 +353,55 @@ namespace __parallel
   template<typename _RAIter1, typename _RAIter2>
     _RAIter1
     __search_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-		  random_access_iterator_tag, random_access_iterator_tag);
+                  random_access_iterator_tag, random_access_iterator_tag);
 
   template<typename _FIter1, typename _FIter2, typename _IterTag1,
-	   typename _IterTag2>
+           typename _IterTag2>
     _FIter1
     __search_switch(_FIter1, _FIter1, _FIter2, _FIter2, _IterTag1, _IterTag2);
 
   template<typename _RAIter1, typename _RAIter2, typename _BiPredicate>
     _RAIter1
     __search_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2, _BiPredicate,
-		  random_access_iterator_tag, random_access_iterator_tag);
+                  random_access_iterator_tag, random_access_iterator_tag);
 
   template<typename _FIter1, typename _FIter2, typename _BiPredicate,
-	   typename _IterTag1, typename _IterTag2>
+           typename _IterTag1, typename _IterTag2>
     _FIter1
     __search_switch(_FIter1, _FIter1, _FIter2, _FIter2, _BiPredicate,
-		  _IterTag1, _IterTag2);
+                  _IterTag1, _IterTag2);
 
   template<typename _FIter, typename _Integer, typename _Tp>
     _FIter
     search_n(_FIter, _FIter, _Integer, const _Tp&,
-	     __gnu_parallel::sequential_tag);
+             __gnu_parallel::sequential_tag);
 
   template<typename _FIter, typename _Integer, typename _Tp,
-	   typename _BiPredicate>
+           typename _BiPredicate>
     _FIter
     search_n(_FIter, _FIter, _Integer, const _Tp&, _BiPredicate,
-	     __gnu_parallel::sequential_tag);
+             __gnu_parallel::sequential_tag);
     
   template<typename _FIter, typename _Integer, typename _Tp>
     _FIter
     search_n(_FIter, _FIter, _Integer, const _Tp&);
 
   template<typename _FIter, typename _Integer, typename _Tp,
-	   typename _BiPredicate>
+           typename _BiPredicate>
     _FIter
     search_n(_FIter, _FIter, _Integer, const _Tp&, _BiPredicate);
 
   template<typename _RAIter, typename _Integer, typename _Tp,
-	   typename _BiPredicate>
+           typename _BiPredicate>
     _RAIter
     __search_n_switch(_RAIter, _RAIter, _Integer, const _Tp&,
-		    _BiPredicate, random_access_iterator_tag);
+                    _BiPredicate, random_access_iterator_tag);
 
   template<typename _FIter, typename _Integer, typename _Tp,
-	   typename _BiPredicate, typename _IterTag>
+           typename _BiPredicate, typename _IterTag>
     _FIter
     __search_n_switch(_FIter, _FIter, _Integer, const _Tp&,
-		    _BiPredicate, _IterTag);
+                    _BiPredicate, _IterTag);
 
 
   template<typename _IIter, typename _OIter, typename _UnaryOperation>
@@ -410,60 +411,60 @@ namespace __parallel
   template<typename _IIter, typename _OIter, typename _UnaryOperation>
     _OIter
     transform(_IIter, _IIter, _OIter, _UnaryOperation, 
-	      __gnu_parallel::sequential_tag);
+              __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _OIter, typename _UnaryOperation>
     _OIter
     transform(_IIter, _IIter, _OIter, _UnaryOperation, 
-	      __gnu_parallel::_Parallelism);
+              __gnu_parallel::_Parallelism);
 
   template<typename _IIter, typename _OIter, typename _UnaryOperation,
-	   typename _IterTag1, typename _IterTag2>
+           typename _IterTag1, typename _IterTag2>
     _OIter
     __transform1_switch(_IIter, _IIter, _OIter, _UnaryOperation, 
-		      _IterTag1, _IterTag2);
+                      _IterTag1, _IterTag2);
     
 
   template<typename _RAIIter, typename _RAOIter, typename _UnaryOperation>
     _RAOIter
     __transform1_switch(_RAIIter, _RAIIter, _RAOIter, _UnaryOperation, 
-		      random_access_iterator_tag, random_access_iterator_tag, 
-		      __gnu_parallel::_Parallelism __parallelism
-		      = __gnu_parallel::parallel_balanced);
+                      random_access_iterator_tag, random_access_iterator_tag, 
+                      __gnu_parallel::_Parallelism __parallelism
+                      = __gnu_parallel::parallel_balanced);
 
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _BiOperation>
+           typename _BiOperation>
     _OIter
     transform(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _BiOperation>
+           typename _BiOperation>
     _OIter
     transform(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation, 
-	      __gnu_parallel::sequential_tag);
+              __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _BiOperation>
+           typename _BiOperation>
     _OIter
     transform(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation, 
-	      __gnu_parallel::_Parallelism);
+              __gnu_parallel::_Parallelism);
 
   template<typename _RAIter1, typename _RAIter2, typename _RAIter3,
-	   typename _BiOperation>
+           typename _BiOperation>
     _RAIter3
     __transform2_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter3, _BiOperation, 
-		      random_access_iterator_tag, random_access_iterator_tag, 
-		      random_access_iterator_tag,
-		      __gnu_parallel::_Parallelism __parallelism
-		      = __gnu_parallel::parallel_balanced);
+                      random_access_iterator_tag, random_access_iterator_tag, 
+                      random_access_iterator_tag,
+                      __gnu_parallel::_Parallelism __parallelism
+                      = __gnu_parallel::parallel_balanced);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _BiOperation, typename _Tag1,
-	   typename _Tag2, typename _Tag3>
+           typename _BiOperation, typename _Tag1,
+           typename _Tag2, typename _Tag3>
     _OIter
     __transform2_switch(_IIter1, _IIter1, _IIter2, _OIter, _BiOperation, 
-		      _Tag1, _Tag2, _Tag3);
+                      _Tag1, _Tag2, _Tag3);
 
 
   template<typename _FIter, typename _Tp>
@@ -473,12 +474,12 @@ namespace __parallel
   template<typename _FIter, typename _Tp>
     void
     replace(_FIter, _FIter, const _Tp&, const _Tp&, 
-	    __gnu_parallel::sequential_tag);
+            __gnu_parallel::sequential_tag);
 
   template<typename _FIter, typename _Tp>
     void
     replace(_FIter, _FIter, const _Tp&, const _Tp&,
-	    __gnu_parallel::_Parallelism);
+            __gnu_parallel::_Parallelism);
 
   template<typename _FIter, typename _Tp, typename _IterTag>
     void
@@ -487,7 +488,7 @@ namespace __parallel
   template<typename _RAIter, typename _Tp>
     void
     __replace_switch(_RAIter, _RAIter, const _Tp&, const _Tp&, 
-		   random_access_iterator_tag, __gnu_parallel::_Parallelism);
+                   random_access_iterator_tag, __gnu_parallel::_Parallelism);
 
 
   template<typename _FIter, typename _Predicate, typename _Tp>
@@ -497,23 +498,23 @@ namespace __parallel
   template<typename _FIter, typename _Predicate, typename _Tp>
     void
     replace_if(_FIter, _FIter, _Predicate, const _Tp&,
-	       __gnu_parallel::sequential_tag);
+               __gnu_parallel::sequential_tag);
 
   template<typename _FIter, typename _Predicate, typename _Tp>
     void
     replace_if(_FIter, _FIter, _Predicate, const _Tp&,
-	       __gnu_parallel::_Parallelism);
+               __gnu_parallel::_Parallelism);
 
   template<typename _FIter, typename _Predicate, typename _Tp,
-	   typename _IterTag>
+           typename _IterTag>
     void
     __replace_if_switch(_FIter, _FIter, _Predicate, const _Tp&, _IterTag);
  
   template<typename _RAIter, typename _Predicate, typename _Tp>
     void
     __replace_if_switch(_RAIter, _RAIter, _Predicate, const _Tp&,
-		      random_access_iterator_tag,
-		      __gnu_parallel::_Parallelism);
+                      random_access_iterator_tag,
+                      __gnu_parallel::_Parallelism);
 
 
   template<typename _FIter>
@@ -546,24 +547,25 @@ namespace __parallel
 
   template<typename _RAIter, typename _Compare>
     _RAIter
-    __max_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, 
-		       __gnu_parallel::_Parallelism __parallelism
-		       = __gnu_parallel::parallel_balanced);
+    __max_element_switch(
+      _RAIter, _RAIter, _Compare, random_access_iterator_tag,
+      __gnu_parallel::_Parallelism __parallelism
+      = __gnu_parallel::parallel_balanced);
 
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, 
-	  __gnu_parallel::sequential_tag);
+          __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Compare>
+           typename _Compare>
     _OIter
     merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare, 
-	  __gnu_parallel::sequential_tag);
+          __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Compare>
+           typename _Compare>
     _OIter
     merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare);
 
@@ -572,18 +574,18 @@ namespace __parallel
     merge(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Compare, typename _IterTag1, typename _IterTag2,
-	   typename _IterTag3>
+           typename _Compare, typename _IterTag1, typename _IterTag2,
+           typename _IterTag3>
     _OIter
     __merge_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare, 
-		 _IterTag1, _IterTag2, _IterTag3);
+                 _IterTag1, _IterTag2, _IterTag3);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Compare>
+           typename _Compare>
     _OIter
     __merge_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Compare, 
-		 random_access_iterator_tag, random_access_iterator_tag, 
-		 random_access_iterator_tag);
+                 random_access_iterator_tag, random_access_iterator_tag, 
+                 random_access_iterator_tag);
 
 
   template<typename _FIter>
@@ -596,7 +598,8 @@ namespace __parallel
 
   template<typename _FIter>
     _FIter
-    min_element(_FIter, _FIter, __gnu_parallel::_Parallelism __parallelism_tag);
+    min_element(_FIter, _FIter,
+                __gnu_parallel::_Parallelism __parallelism_tag);
 
   template<typename _FIter, typename _Compare>
     _FIter
@@ -616,9 +619,10 @@ namespace __parallel
 
   template<typename _RAIter, typename _Compare>
     _RAIter
-    __min_element_switch(_RAIter, _RAIter, _Compare, random_access_iterator_tag, 
-		       __gnu_parallel::_Parallelism __parallelism
-		       = __gnu_parallel::parallel_balanced);
+    __min_element_switch(
+      _RAIter, _RAIter, _Compare, random_access_iterator_tag,
+      __gnu_parallel::_Parallelism __parallelism
+      = __gnu_parallel::parallel_balanced);
 
   template<typename _RAIter>
     void
@@ -627,7 +631,7 @@ namespace __parallel
   template<typename _RAIter, typename _Compare>
     void
     nth_element(_RAIter, _RAIter, _RAIter, _Compare,
-		__gnu_parallel::sequential_tag);
+                __gnu_parallel::sequential_tag);
 
   template<typename _RAIter, typename _Compare>
     void
@@ -640,7 +644,7 @@ namespace __parallel
   template<typename _RAIter, typename _Compare>
     void
     partial_sort(_RAIter, _RAIter, _RAIter, _Compare,
-		 __gnu_parallel::sequential_tag);
+                 __gnu_parallel::sequential_tag);
 
   template<typename _RAIter>
     void
@@ -668,7 +672,8 @@ namespace __parallel
     
   template<typename _RAIter, typename _Predicate>
     _RAIter
-    __partition_switch(_RAIter, _RAIter, _Predicate, random_access_iterator_tag);
+    __partition_switch(
+      _RAIter, _RAIter, _Predicate, random_access_iterator_tag);
 
   template<typename _RAIter>
     void
@@ -677,7 +682,7 @@ namespace __parallel
   template<typename _RAIter, typename _RandomNumberGenerator>
     void
     random_shuffle(_RAIter, _RAIter, _RandomNumberGenerator&,
-		   __gnu_parallel::sequential_tag);
+                   __gnu_parallel::sequential_tag);
 
   template<typename _RAIter>
     void
@@ -690,147 +695,147 @@ namespace __parallel
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-	    __gnu_parallel::sequential_tag);
+            __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter
     set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate,
-	      __gnu_parallel::sequential_tag);
+              __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter 
     set_union(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate);
 
   template<typename _IIter1, typename _IIter2, typename _Predicate,
-	   typename _OIter, typename _IterTag1, typename _IterTag2,
-	   typename _IterTag3>
+           typename _OIter, typename _IterTag1, typename _IterTag2,
+           typename _IterTag3>
     _OIter
     __set_union_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-		     _Predicate, _IterTag1, _IterTag2, _IterTag3);
+                     _Predicate, _IterTag1, _IterTag2, _IterTag3);
 
   template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-	   typename _Predicate>
+           typename _Predicate>
     _Output_RAIter
     __set_union_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2, _Output_RAIter,
-		     _Predicate, random_access_iterator_tag,
-		     random_access_iterator_tag, random_access_iterator_tag);
+                     _Predicate, random_access_iterator_tag,
+                     random_access_iterator_tag, random_access_iterator_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-		     __gnu_parallel::sequential_tag);
+                     __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter
     set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate,
-		     __gnu_parallel::sequential_tag);
+                     __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter 
     set_intersection(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate);
 
   template<typename _IIter1, typename _IIter2, typename _Predicate,
-	   typename _OIter, typename _IterTag1, typename _IterTag2,
-	   typename _IterTag3>
+           typename _OIter, typename _IterTag1, typename _IterTag2,
+           typename _IterTag3>
     _OIter
     __set_intersection_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-			    _Predicate, _IterTag1, _IterTag2, _IterTag3);
+                            _Predicate, _IterTag1, _IterTag2, _IterTag3);
 
   template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-	   typename _Predicate>
+           typename _Predicate>
     _Output_RAIter
     __set_intersection_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-			    _Output_RAIter, _Predicate,
-			    random_access_iterator_tag,
-			    random_access_iterator_tag,
-			    random_access_iterator_tag);
+                            _Output_RAIter, _Predicate,
+                            random_access_iterator_tag,
+                            random_access_iterator_tag,
+                            random_access_iterator_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-			     __gnu_parallel::sequential_tag);
+                             __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter
     set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-			     _Predicate, __gnu_parallel::sequential_tag);
+                             _Predicate, __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter 
     set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter 
     set_symmetric_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-			     _Predicate);
+                             _Predicate);
 
   template<typename _IIter1, typename _IIter2, typename _Predicate,
-	   typename _OIter, typename _IterTag1, typename _IterTag2,
-	   typename _IterTag3>
+           typename _OIter, typename _IterTag1, typename _IterTag2,
+           typename _IterTag3>
     _OIter
     __set_symmetric_difference_switch(_IIter1, _IIter1, _IIter2, _IIter2,
-				    _OIter, _Predicate, _IterTag1, _IterTag2,
-				    _IterTag3);
+                                    _OIter, _Predicate, _IterTag1, _IterTag2,
+                                    _IterTag3);
 
   template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-	   typename _Predicate>
+           typename _Predicate>
     _Output_RAIter
     __set_symmetric_difference_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-				    _Output_RAIter, _Predicate,
-				    random_access_iterator_tag,
-				    random_access_iterator_tag,
-				    random_access_iterator_tag);
+                                    _Output_RAIter, _Predicate,
+                                    random_access_iterator_tag,
+                                    random_access_iterator_tag,
+                                    random_access_iterator_tag);
 
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-		   __gnu_parallel::sequential_tag);
+                   __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter
     set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate,
-		   __gnu_parallel::sequential_tag);
+                   __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _OIter>
     _OIter
     set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter);
 
   template<typename _IIter1, typename _IIter2, typename _OIter,
-	   typename _Predicate>
+           typename _Predicate>
     _OIter
     set_difference(_IIter1, _IIter1, _IIter2, _IIter2, _OIter, _Predicate);
 
   template<typename _IIter1, typename _IIter2, typename _Predicate,
-	   typename _OIter, typename _IterTag1, typename _IterTag2,
-	   typename _IterTag3>
+           typename _OIter, typename _IterTag1, typename _IterTag2,
+           typename _IterTag3>
     _OIter
     __set_difference_switch(_IIter1, _IIter1, _IIter2, _IIter2, _OIter,
-			  _Predicate, _IterTag1, _IterTag2, _IterTag3);
+                          _Predicate, _IterTag1, _IterTag2, _IterTag3);
 
   template<typename _RAIter1, typename _RAIter2, typename _Output_RAIter,
-	   typename _Predicate>
+           typename _Predicate>
     _Output_RAIter
     __set_difference_switch(_RAIter1, _RAIter1, _RAIter2, _RAIter2,
-			  _Output_RAIter, _Predicate,
-			  random_access_iterator_tag,
-			  random_access_iterator_tag,
-			  random_access_iterator_tag);
+                          _Output_RAIter, _Predicate,
+                          random_access_iterator_tag,
+                          random_access_iterator_tag,
+                          random_access_iterator_tag);
 
 
   template<typename _RAIter>
@@ -872,7 +877,7 @@ namespace __parallel
   template<typename _IIter, typename _OIter, typename _Predicate>
     _OIter
     unique_copy(_IIter, _IIter, _OIter, _Predicate,
-		__gnu_parallel::sequential_tag);
+                __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _OIter>
     _OIter
@@ -883,15 +888,15 @@ namespace __parallel
     unique_copy(_IIter, _IIter, _OIter, _Predicate);
 
   template<typename _IIter, typename _OIter, typename _Predicate,
-	   typename _IterTag1, typename _IterTag2>
+           typename _IterTag1, typename _IterTag2>
     _OIter
     __unique_copy_switch(_IIter, _IIter, _OIter, _Predicate,
-		       _IterTag1, _IterTag2);
+                       _IterTag1, _IterTag2);
 
   template<typename _RAIter, typename _RandomAccess_OIter, typename _Predicate>
     _RandomAccess_OIter
     __unique_copy_switch(_RAIter, _RAIter, _RandomAccess_OIter, _Predicate,
-		       random_access_iterator_tag, random_access_iterator_tag);
+                       random_access_iterator_tag, random_access_iterator_tag);
 } // end namespace __parallel
 } // end namespace std
 
diff --git a/libstdc++-v3/include/parallel/balanced_quicksort.h b/libstdc++-v3/include/parallel/balanced_quicksort.h
index 6a6f6a240ec..85e4d699e26 100644
--- a/libstdc++-v3/include/parallel/balanced_quicksort.h
+++ b/libstdc++-v3/include/parallel/balanced_quicksort.h
@@ -108,19 +108,25 @@ template<typename _RAIter, typename _Compare>
 
     _RAIter __pivot_pos =
       __median_of_three_iterators(__begin, __begin + (__end - __begin) / 2,
-				__end  - 1, __comp);
+                                __end  - 1, __comp);
 
 #if defined(_GLIBCXX_ASSERTIONS)
     // Must be in between somewhere.
     _DifferenceType __n = __end - __begin;
 
     _GLIBCXX_PARALLEL_ASSERT(
-           (!__comp(*__pivot_pos, *__begin) && !__comp(*(__begin + __n / 2), *__pivot_pos))
-        || (!__comp(*__pivot_pos, *__begin) && !__comp(*(__end - 1), *__pivot_pos))
-        || (!__comp(*__pivot_pos, *(__begin + __n / 2)) && !__comp(*__begin, *__pivot_pos))
-        || (!__comp(*__pivot_pos, *(__begin + __n / 2)) && !__comp(*(__end - 1), *__pivot_pos))
-        || (!__comp(*__pivot_pos, *(__end - 1)) && !__comp(*__begin, *__pivot_pos))
-        || (!__comp(*__pivot_pos, *(__end - 1)) && !__comp(*(__begin + __n / 2), *__pivot_pos)));
+           (!__comp(*__pivot_pos, *__begin) &&
+              !__comp(*(__begin + __n / 2), *__pivot_pos))
+        || (!__comp(*__pivot_pos, *__begin) &&
+              !__comp(*(__end - 1), *__pivot_pos))
+        || (!__comp(*__pivot_pos, *(__begin + __n / 2)) &&
+              !__comp(*__begin, *__pivot_pos))
+        || (!__comp(*__pivot_pos, *(__begin + __n / 2)) &&
+              !__comp(*(__end - 1), *__pivot_pos))
+        || (!__comp(*__pivot_pos, *(__end - 1)) &&
+              !__comp(*__begin, *__pivot_pos))
+        || (!__comp(*__pivot_pos, *(__end - 1)) &&
+              !__comp(*(__begin + __n / 2), *__pivot_pos)));
 #endif
 
     // Swap pivot value to end.
@@ -183,15 +189,17 @@ template<typename _RAIter, typename _Compare>
       }
 
     // Divide step.
-    _DifferenceType __split_pos = __qsb_divide(__begin, __end, __comp, __num_threads);
+    _DifferenceType __split_pos =
+            __qsb_divide(__begin, __end, __comp, __num_threads);
 
 #if _GLIBCXX_ASSERTIONS
-    _GLIBCXX_PARALLEL_ASSERT(0 <= __split_pos && __split_pos < (__end - __begin));
+    _GLIBCXX_PARALLEL_ASSERT(0 <= __split_pos &&
+                             __split_pos < (__end - __begin));
 #endif
 
     _ThreadIndex __num_threads_leftside =
         std::max<_ThreadIndex>(1, std::min<_ThreadIndex>(
-                          __num_threads - 1, __split_pos * __num_threads / __n));
+            __num_threads - 1, __split_pos * __num_threads / __n));
 
 #   pragma omp atomic
     *__tls[__iam]->_M_elements_leftover -= (_DifferenceType)1;
@@ -284,11 +292,13 @@ template<typename _RAIter, typename _Compare>
 
             // Divide, leave pivot unchanged in last place.
             _RAIter __split_pos1, __split_pos2;
-            __split_pos1 = __gnu_sequential::partition(__begin, __end - 1, __pred);
+            __split_pos1 =
+                    __gnu_sequential::partition(__begin, __end - 1, __pred);
 
             // Left side: < __pivot_pos; __right side: >= __pivot_pos.
 #if _GLIBCXX_ASSERTIONS
-            _GLIBCXX_PARALLEL_ASSERT(__begin <= __split_pos1 && __split_pos1 < __end);
+            _GLIBCXX_PARALLEL_ASSERT(__begin <= __split_pos1
+                                     && __split_pos1 < __end);
 #endif
             // Swap pivot back to middle.
             if (__split_pos1 != __pivot_pos)
@@ -302,14 +312,14 @@ template<typename _RAIter, typename _Compare>
                 // Very unequal split, one part smaller than one 128th
                 // elements not strictly larger than the pivot.
                 __gnu_parallel::__unary_negate<__gnu_parallel::__binder1st
-		  <_Compare, _ValueType, _ValueType, bool>, _ValueType>
-		  __pred(__gnu_parallel::__binder1st
-		       <_Compare, _ValueType, _ValueType, bool>(__comp,
-								  *__pivot_pos));
+                  <_Compare, _ValueType, _ValueType, bool>, _ValueType>
+                  __pred(__gnu_parallel::__binder1st
+                       <_Compare, _ValueType, _ValueType, bool>(
+                          __comp, *__pivot_pos));
 
                 // Find other end of pivot-equal range.
                 __split_pos2 = __gnu_sequential::partition(__split_pos1 + 1,
-							 __end, __pred);
+                                                         __end, __pred);
               }
             else
               // Only skip the pivot.
@@ -325,10 +335,10 @@ template<typename _RAIter, typename _Compare>
               {
                 // Right side larger.
                 if ((__split_pos2) != __end)
-                  __tl._M_leftover_parts.push_front(std::make_pair(__split_pos2,
-							      __end));
+                  __tl._M_leftover_parts.push_front(
+                    std::make_pair(__split_pos2, __end));
 
-                //__current.first = __begin;	//already set anyway
+                //__current.first = __begin;    //already set anyway
                 __current.second = __split_pos1;
                 continue;
               }
@@ -337,10 +347,10 @@ template<typename _RAIter, typename _Compare>
                 // Left side larger.
                 if (__begin != __split_pos1)
                   __tl._M_leftover_parts.push_front(std::make_pair(__begin,
-							      __split_pos1));
+                                                              __split_pos1));
 
                 __current.first = __split_pos2;
-                //__current.second = __end;	//already set anyway
+                //__current.second = __end;     //already set anyway
                 continue;
               }
           }
@@ -367,10 +377,11 @@ template<typename _RAIter, typename _Compare>
 
             // Look for new work.
             bool __successfully_stolen = false;
-            while (__wait && *__tl._M_elements_leftover > 0 && !__successfully_stolen
+            while (__wait && *__tl._M_elements_leftover > 0
+                   && !__successfully_stolen
 #if _GLIBCXX_ASSERTIONS
-              // Possible dead-lock.
-              && (omp_get_wtime() < (__search_start + 1.0))
+                    // Possible dead-lock.
+                   && (omp_get_wtime() < (__search_start + 1.0))
 #endif
               )
               {
@@ -392,7 +403,7 @@ template<typename _RAIter, typename _Compare>
               {
                 sleep(1);
                 _GLIBCXX_PARALLEL_ASSERT(omp_get_wtime()
-					 < (__search_start + 1.0));
+                                         < (__search_start + 1.0));
               }
 #endif
             if (!__successfully_stolen)
@@ -439,11 +450,13 @@ template<typename _RAIter, typename _Compare>
 
     // Initialize thread local storage
     _TLSType** __tls = new _TLSType*[__num_threads];
-    _DifferenceType __queue_size = __num_threads * (_ThreadIndex)(log2(__n) + 1);
+    _DifferenceType __queue_size =
+                           __num_threads * (_ThreadIndex)(log2(__n) + 1);
     for (_ThreadIndex __t = 0; __t < __num_threads; ++__t)
       __tls[__t] = new _QSBThreadLocal<_RAIter>(__queue_size);
 
-    // There can never be more than ceil(log2(__n)) ranges on the stack, because
+    // There can never be more than ceil(log2(__n)) ranges on the stack,
+    // because
     // 1. Only one processor pushes onto the stack
     // 2. The largest range has at most length __n
     // 3. Each range is larger than half of the range remaining
@@ -459,13 +472,15 @@ template<typename _RAIter, typename _Compare>
       }
 
     // Main recursion call.
-    __qsb_conquer(__tls, __begin, __begin + __n, __comp, 0, __num_threads, true);
+    __qsb_conquer(
+      __tls, __begin, __begin + __n, __comp, 0, __num_threads, true);
 
 #if _GLIBCXX_ASSERTIONS
     // All stack must be empty.
     _Piece __dummy;
     for (int __i = 1; __i < __num_threads; ++__i)
-      _GLIBCXX_PARALLEL_ASSERT(!__tls[__i]->_M_leftover_parts.pop_back(__dummy));
+      _GLIBCXX_PARALLEL_ASSERT(
+        !__tls[__i]->_M_leftover_parts.pop_back(__dummy));
 #endif
 
     for (int __i = 0; __i < __num_threads; ++__i)
diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h
index 92f787404ad..6925696a72e 100644
--- a/libstdc++-v3/include/parallel/base.h
+++ b/libstdc++-v3/include/parallel/base.h
@@ -119,7 +119,7 @@ template<typename _Size>
   *  @see decode2
   */
 inline _CASable
-__encode2(int __a, int __b)	//must all be non-negative, actually
+__encode2(int __a, int __b)     //must all be non-negative, actually
 {
   return (((_CASable)__a) << (_CASable_bits / 2)) | (((_CASable)__b) << 0);
 }
@@ -192,7 +192,7 @@ template<typename _Predicate, typename argument_type>
 /** @brief Similar to std::__binder1st,
   *  but giving the argument types explicitly. */
 template<typename _Operation, typename _FirstArgumentType,
-	 typename _SecondArgumentType, typename _ResultType>
+         typename _SecondArgumentType, typename _ResultType>
   class __binder1st
   : public std::unary_function<_SecondArgumentType, _ResultType>
   {
@@ -221,7 +221,7 @@ template<typename _Operation, typename _FirstArgumentType,
   *  explicitly.
   */
 template<typename _Operation, typename _FirstArgumentType,
-	 typename _SecondArgumentType, typename _ResultType>
+         typename _SecondArgumentType, typename _ResultType>
   class binder2nd
   : public std::unary_function<_FirstArgumentType, _ResultType>
   {
@@ -281,7 +281,7 @@ template<typename _Tp1, typename _Tp2>
   struct _Plus : public std::binary_function<_Tp1, _Tp2, _Tp1>
   {
     typedef __typeof__(*static_cast<_Tp1*>(NULL)
-		       + *static_cast<_Tp2*>(NULL)) __result;
+                       + *static_cast<_Tp2*>(NULL)) __result;
 
     __result
     operator()(const _Tp1& __x, const _Tp2& __y) const
@@ -293,7 +293,7 @@ template<typename _Tp>
   struct _Plus<_Tp, _Tp> : public std::binary_function<_Tp, _Tp, _Tp>
   {
     typedef __typeof__(*static_cast<_Tp*>(NULL)
-		       + *static_cast<_Tp*>(NULL)) __result;
+                       + *static_cast<_Tp*>(NULL)) __result;
 
     __result
     operator()(const _Tp& __x, const _Tp& __y) const
@@ -306,7 +306,7 @@ template<typename _Tp1, typename _Tp2>
   struct _Multiplies : public std::binary_function<_Tp1, _Tp2, _Tp1>
   {
     typedef __typeof__(*static_cast<_Tp1*>(NULL)
-		       * *static_cast<_Tp2*>(NULL)) __result;
+                       * *static_cast<_Tp2*>(NULL)) __result;
 
     __result
     operator()(const _Tp1& __x, const _Tp2& __y) const
@@ -318,7 +318,7 @@ template<typename _Tp>
   struct _Multiplies<_Tp, _Tp> : public std::binary_function<_Tp, _Tp, _Tp>
   {
     typedef __typeof__(*static_cast<_Tp*>(NULL)
-		       * *static_cast<_Tp*>(NULL)) __result;
+                       * *static_cast<_Tp*>(NULL)) __result;
 
     __result
     operator()(const _Tp& __x, const _Tp& __y) const
diff --git a/libstdc++-v3/include/parallel/checkers.h b/libstdc++-v3/include/parallel/checkers.h
index 47d21749a86..5d3acfa4b8d 100644
--- a/libstdc++-v3/include/parallel/checkers.h
+++ b/libstdc++-v3/include/parallel/checkers.h
@@ -39,7 +39,8 @@
 namespace __gnu_parallel
 {
   /**
-   * @brief Check whether @__c [__begin, @__c __end) is sorted according to @__c __comp.
+   * @brief Check whether @__c [__begin, @__c __end) is sorted according
+   * to @__c __comp.
    * @param __begin Begin iterator of sequence.
    * @param __end End iterator of sequence.
    * @param __comp Comparator.
@@ -49,33 +50,34 @@ namespace __gnu_parallel
   template<typename _IIter, typename _Compare>
     bool
     __is_sorted(_IIter __begin, _IIter __end,
-	      _Compare __comp
-	      = std::less<typename std::iterator_traits<_IIter>::
-	      _ValueType>())
+              _Compare __comp
+              = std::less<typename std::iterator_traits<_IIter>::
+              _ValueType>())
     {
       if (__begin == __end)
-	return true;
+        return true;
 
       _IIter __current(__begin), __recent(__begin);
 
       unsigned long long __position = 1;
       for (__current++; __current != __end; __current++)
-	{
-	  if (__comp(*__current, *__recent))
-	    {
-	      printf("__is_sorted: check failed before position %__i.\n",
-		     __position);
-	      return false;
-	    }
-	  __recent = __current;
-	  __position++;
-	}
+        {
+          if (__comp(*__current, *__recent))
+            {
+              printf("__is_sorted: check failed before position %__i.\n",
+                     __position);
+              return false;
+            }
+          __recent = __current;
+          __position++;
+        }
 
       return true;
     }
 
   /**
-   * @brief Check whether @__c [__begin, @__c __end) is sorted according to @__c __comp.
+   * @brief Check whether @__c [__begin, @__c __end) is sorted according to
+   * @__c __comp.
    * Prints the position in case an unordered pair is found.
    * @param __begin Begin iterator of sequence.
    * @param __end End iterator of sequence.
@@ -87,36 +89,37 @@ namespace __gnu_parallel
   template<typename _IIter, typename _Compare>
     bool
     is_sorted_failure(_IIter __begin, _IIter __end,
-		      _IIter& __first_failure,
-		      _Compare __comp
-		      = std::less<typename std::iterator_traits<_IIter>::
-		      _ValueType>())
+                      _IIter& __first_failure,
+                      _Compare __comp
+                      = std::less<typename std::iterator_traits<_IIter>::
+                      _ValueType>())
     {
       if (__begin == __end)
-	return true;
+        return true;
 
       _IIter __current(__begin), __recent(__begin);
 
       unsigned long long __position = 1;
       for (__current++; __current != __end; __current++)
-	{
-	  if (__comp(*__current, *__recent))
-	    {
-	      __first_failure = __current;
-	      printf("__is_sorted: check failed before position %lld.\n",
-		     __position);
-	      return false;
-	    }
-	  __recent = __current;
-	  __position++;
-	}
+        {
+          if (__comp(*__current, *__recent))
+            {
+              __first_failure = __current;
+              printf("__is_sorted: check failed before position %lld.\n",
+                     __position);
+              return false;
+            }
+          __recent = __current;
+          __position++;
+        }
 
       __first_failure = __end;
       return true;
     }
 
   /**
-   * @brief Check whether @__c [__begin, @__c __end) is sorted according to @__c __comp.
+   * @brief Check whether @__c [__begin, @__c __end) is sorted according to
+   * @__c __comp.
    * Prints all unordered pair, including the surrounding two elements.
    * @param __begin Begin iterator of sequence.
    * @param __end End iterator of sequence.
@@ -127,26 +130,26 @@ namespace __gnu_parallel
     bool
     // XXX Compare default template argument
     is_sorted_print_failures(_IIter __begin, _IIter __end,
-			     _Compare __comp
-			     = std::less<typename std::iterator_traits
-			     <_IIter>::value_type>())
+                             _Compare __comp
+                             = std::less<typename std::iterator_traits
+                             <_IIter>::value_type>())
     {
       if (__begin == __end)
-	return true;
+        return true;
 
       _IIter __recent(__begin);
       bool __ok = true;
 
       for (_IIter __pos(__begin + 1); __pos != __end; __pos++)
-	{
-	  if (__comp(*__pos, *__recent))
-	    {
-	      printf("%ld: %d %d %d %d\n", __pos - __begin, *(__pos - 2),
-		     *(__pos- 1), *__pos, *(__pos + 1));
-	      __ok = false;
-	    }
-	  __recent = __pos;
-	}
+        {
+          if (__comp(*__pos, *__recent))
+            {
+              printf("%ld: %d %d %d %d\n", __pos - __begin, *(__pos - 2),
+                     *(__pos- 1), *__pos, *(__pos + 1));
+              __ok = false;
+            }
+          __recent = __pos;
+        }
       return __ok;
     }
 }
diff --git a/libstdc++-v3/include/parallel/compatibility.h b/libstdc++-v3/include/parallel/compatibility.h
index 2dc02a8898c..e10370b6f54 100644
--- a/libstdc++-v3/include/parallel/compatibility.h
+++ b/libstdc++-v3/include/parallel/compatibility.h
@@ -65,9 +65,9 @@ namespace __gnu_parallel
   int32 __faa32(int32* __x, int32 __inc)
   {
     asm volatile("lock xadd %0,%1"
-		 : "=__r" (__inc), "=__m" (*__x)
-		 : "0" (__inc)
-		 : "memory");
+                 : "=__r" (__inc), "=__m" (*__x)
+                 : "0" (__inc)
+                 : "memory");
     return __inc;
   }
 #if defined(__x86_64)
@@ -75,9 +75,9 @@ namespace __gnu_parallel
   int64 __faa64(int64* __x, int64 __inc)
   {
     asm volatile("lock xadd %0,%1"
-		 : "=__r" (__inc), "=__m" (*__x)
-		 : "0" (__inc)
-		 : "memory");
+                 : "=__r" (__inc), "=__m" (*__x)
+                 : "0" (__inc)
+                 : "memory");
     return __inc;
   }
 #endif
@@ -94,25 +94,25 @@ namespace __gnu_parallel
   inline int32
   __fetch_and_add_32(volatile int32* __ptr, int32 __addend)
   {
-#if defined(__ICC)	//x86 version
+#if defined(__ICC)      //x86 version
     return _InterlockedExchangeAdd((void*)__ptr, __addend);
-#elif defined(__ECC)	//IA-64 version
+#elif defined(__ECC)    //IA-64 version
     return _InterlockedExchangeAdd((void*)__ptr, __addend);
 #elif defined(__ICL) || defined(_MSC_VER)
     return _InterlockedExchangeAdd(reinterpret_cast<volatile long*>(__ptr),
-				   __addend);
+                                   __addend);
 #elif defined(__GNUC__)
     return __sync_fetch_and_add(__ptr, __addend);
 #elif defined(__SUNPRO_CC) && defined(__sparc)
     volatile int32 __before, __after;
     do
       {
-	__before = *__ptr;
-	__after = __before + __addend;
+        __before = *__ptr;
+        __after = __before + __addend;
       } while (atomic_cas_32((volatile unsigned int*)__ptr, __before,
-			     __after) != __before);
+                             __after) != __before);
     return __before;
-#else	//fallback, slow
+#else   //fallback, slow
 #pragma message("slow __fetch_and_add_32")
     int32 __res;
 #pragma omp critical
@@ -133,32 +133,32 @@ namespace __gnu_parallel
   inline int64
   __fetch_and_add_64(volatile int64* __ptr, int64 __addend)
   {
-#if defined(__ICC) && defined(__x86_64)	//x86 version
+#if defined(__ICC) && defined(__x86_64) //x86 version
     return __faa64<int>((int64*)__ptr, __addend);
-#elif defined(__ECC)	//IA-64 version
+#elif defined(__ECC)    //IA-64 version
     return _InterlockedExchangeAdd64((void*)__ptr, __addend);
 #elif defined(__ICL) || defined(_MSC_VER)
 #ifndef _WIN64
-    _GLIBCXX_PARALLEL_ASSERT(false);	//not available in this case
+    _GLIBCXX_PARALLEL_ASSERT(false);    //not available in this case
     return 0;
 #else
     return _InterlockedExchangeAdd64(__ptr, __addend);
 #endif
 #elif defined(__GNUC__) && defined(__x86_64)
     return __sync_fetch_and_add(__ptr, __addend);
-#elif defined(__GNUC__) && defined(__i386) &&			\
+#elif defined(__GNUC__) && defined(__i386) &&                   \
   (defined(__i686) || defined(__pentium4) || defined(__athlon))
     return __sync_fetch_and_add(__ptr, __addend);
 #elif defined(__SUNPRO_CC) && defined(__sparc)
     volatile int64 __before, __after;
     do
       {
-	__before = *__ptr;
-	__after = __before + __addend;
+        __before = *__ptr;
+        __after = __before + __addend;
       } while (atomic_cas_64((volatile unsigned long long*)__ptr, __before,
-			     __after) != __before);
+                             __after) != __before);
     return __before;
-#else	//fallback, slow
+#else   //fallback, slow
 #if defined(__GNUC__) && defined(__i386)
     // XXX doesn'__t work with -march=native
     //#warning "please compile with -march=i686 or better"
@@ -201,9 +201,10 @@ namespace __gnu_parallel
   {
     int32 __before;
     __asm__ __volatile__("lock; cmpxchgl %1,%2"
-			 : "=a"(__before)
-			 : "q"(__nw), "__m"(*(volatile long long*)(__ptr)), "0"(__old)
-			 : "memory");
+                         : "=a"(__before)
+                         : "q"(__nw), "__m"(*(volatile long long*)(__ptr)),
+                               "0"(__old)
+                         : "memory");
     return __before;
   }
 
@@ -214,9 +215,10 @@ namespace __gnu_parallel
   {
     int64 __before;
     __asm__ __volatile__("lock; cmpxchgq %1,%2"
-			 : "=a"(__before)
-			 : "q"(__nw), "__m"(*(volatile long long*)(__ptr)), "0"(__old)
-			 : "memory");
+                         : "=a"(__before)
+                         : "q"(__nw), "__m"(*(volatile long long*)(__ptr)),
+                               "0"(__old)
+                         : "memory");
     return __before;
   }
 #endif
@@ -232,32 +234,35 @@ namespace __gnu_parallel
    *  @param __replacement Replacement value.
    */
   inline bool
-  __compare_and_swap_32(volatile int32* __ptr, int32 __comparand, int32 __replacement)
+  __compare_and_swap_32(volatile int32* __ptr, int32 __comparand,
+                        int32 __replacement)
   {
-#if defined(__ICC)	//x86 version
+#if defined(__ICC)      //x86 version
     return _InterlockedCompareExchange((void*)__ptr, __replacement,
-				       __comparand) == __comparand;
-#elif defined(__ECC)	//IA-64 version
+                                       __comparand) == __comparand;
+#elif defined(__ECC)    //IA-64 version
     return _InterlockedCompareExchange((void*)__ptr, __replacement,
-				       __comparand) == __comparand;
+                                       __comparand) == __comparand;
 #elif defined(__ICL) || defined(_MSC_VER)
-    return _InterlockedCompareExchange(reinterpret_cast<volatile long*>(__ptr),
-				       __replacement, __comparand) == __comparand;
+    return _InterlockedCompareExchange(
+               reinterpret_cast<volatile long*>(__ptr),
+               __replacement, __comparand)
+             == __comparand;
 #elif defined(__GNUC__)
     return __sync_bool_compare_and_swap(__ptr, __comparand, __replacement);
 #elif defined(__SUNPRO_CC) && defined(__sparc)
     return atomic_cas_32((volatile unsigned int*)__ptr, __comparand,
-			 __replacement) == __comparand;
+                         __replacement) == __comparand;
 #else
 #pragma message("slow __compare_and_swap_32")
     bool __res = false;
 #pragma omp critical
     {
       if (*__ptr == __comparand)
-	{
-	  *__ptr = __replacement;
-	  __res = true;
-	}
+        {
+          *__ptr = __replacement;
+          __res = true;
+        }
     }
     return __res;
 #endif
@@ -272,30 +277,31 @@ namespace __gnu_parallel
    *  @param __replacement Replacement value.
    */
   inline bool
-  __compare_and_swap_64(volatile int64* __ptr, int64 __comparand, int64 __replacement)
+  __compare_and_swap_64(volatile int64* __ptr, int64 __comparand,
+                        int64 __replacement)
   {
-#if defined(__ICC) && defined(__x86_64)	//x86 version
+#if defined(__ICC) && defined(__x86_64) //x86 version
     return __cas64<int>(__ptr, __comparand, __replacement) == __comparand;
-#elif defined(__ECC)	//IA-64 version
+#elif defined(__ECC)    //IA-64 version
     return _InterlockedCompareExchange64((void*)__ptr, __replacement,
-					 __comparand) == __comparand;
+                                         __comparand) == __comparand;
 #elif defined(__ICL) || defined(_MSC_VER)
 #ifndef _WIN64
-    _GLIBCXX_PARALLEL_ASSERT(false);	//not available in this case
+    _GLIBCXX_PARALLEL_ASSERT(false);    //not available in this case
     return 0;
 #else
     return _InterlockedCompareExchange64(__ptr, __replacement,
-					 __comparand) == __comparand;
+                                         __comparand) == __comparand;
 #endif
 
 #elif defined(__GNUC__) && defined(__x86_64)
     return __sync_bool_compare_and_swap(__ptr, __comparand, __replacement);
-#elif defined(__GNUC__) && defined(__i386) &&			\
+#elif defined(__GNUC__) && defined(__i386) &&                   \
   (defined(__i686) || defined(__pentium4) || defined(__athlon))
     return __sync_bool_compare_and_swap(__ptr, __comparand, __replacement);
 #elif defined(__SUNPRO_CC) && defined(__sparc)
     return atomic_cas_64((volatile unsigned long long*)__ptr,
-			 __comparand, __replacement) == __comparand;
+                         __comparand, __replacement) == __comparand;
 #else
 #if defined(__GNUC__) && defined(__i386)
     // XXX -march=native
@@ -306,10 +312,10 @@ namespace __gnu_parallel
 #pragma omp critical
     {
       if (*__ptr == __comparand)
-	{
-	  *__ptr = __replacement;
-	  __res = true;
-	}
+        {
+          *__ptr = __replacement;
+          __res = true;
+        }
     }
     return __res;
 #endif
@@ -327,9 +333,11 @@ namespace __gnu_parallel
   __compare_and_swap(volatile _Tp* __ptr, _Tp __comparand, _Tp __replacement)
   {
     if (sizeof(_Tp) == sizeof(int32))
-      return __compare_and_swap_32((volatile int32*) __ptr, (int32)__comparand, (int32)__replacement);
+      return __compare_and_swap_32((volatile int32*) __ptr, (int32)__comparand,
+                                   (int32)__replacement);
     else if (sizeof(_Tp) == sizeof(int64))
-      return __compare_and_swap_64((volatile int64*) __ptr, (int64)__comparand, (int64)__replacement);
+      return __compare_and_swap_64((volatile int64*) __ptr, (int64)__comparand,
+                                   (int64)__replacement);
     else
       _GLIBCXX_PARALLEL_ASSERT(false);
   }
diff --git a/libstdc++-v3/include/parallel/equally_split.h b/libstdc++-v3/include/parallel/equally_split.h
index 11672c4579a..a41ed6ec41e 100644
--- a/libstdc++-v3/include/parallel/equally_split.h
+++ b/libstdc++-v3/include/parallel/equally_split.h
@@ -45,7 +45,8 @@ namespace __gnu_parallel
  *  @returns End of splitter sequence, i.e. @__c __s+__num_threads+1 */
 template<typename _DifferenceType, typename _OutputIterator>
   _OutputIterator
-  equally_split(_DifferenceType __n, _ThreadIndex __num_threads, _OutputIterator __s)
+  equally_split(_DifferenceType __n, _ThreadIndex __num_threads,
+                _OutputIterator __s)
   {
     _DifferenceType __chunk_length = __n / __num_threads;
     _DifferenceType __num_longer_chunks = __n % __num_threads;
@@ -53,7 +54,8 @@ template<typename _DifferenceType, typename _OutputIterator>
     for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
       {
         *__s++ = __pos;
-        __pos += (__i < __num_longer_chunks) ? (__chunk_length + 1) : __chunk_length;
+        __pos += (__i < __num_longer_chunks) ?
+                                      (__chunk_length + 1) : __chunk_length;
       }
     *__s++ = __n;
     return __s;
diff --git a/libstdc++-v3/include/parallel/find.h b/libstdc++-v3/include/parallel/find.h
index 6c84981a8c3..e7f0d839086 100644
--- a/libstdc++-v3/include/parallel/find.h
+++ b/libstdc++-v3/include/parallel/find.h
@@ -53,9 +53,9 @@ namespace __gnu_parallel
  *  @return Place of finding in both sequences.
  */
 template<typename _RAIter1,
-	 typename _RAIter2,
-	 typename _Pred,
-	 typename _Selector>
+         typename _RAIter2,
+         typename _Pred,
+         typename _Selector>
   inline std::pair<_RAIter1, _RAIter2>
   __find_template(_RAIter1 __begin1, _RAIter1 __end1,
                 _RAIter2 __begin2, _Pred __pred, _Selector __selector)
@@ -64,13 +64,13 @@ template<typename _RAIter1,
       {
       case GROWING_BLOCKS:
         return __find_template(__begin1, __end1, __begin2, __pred, __selector,
-			     growing_blocks_tag());
+                             growing_blocks_tag());
       case CONSTANT_SIZE_BLOCKS:
         return __find_template(__begin1, __end1, __begin2, __pred, __selector,
-			     constant_size_blocks_tag());
+                             constant_size_blocks_tag());
       case EQUAL_SPLIT:
         return __find_template(__begin1, __end1, __begin2, __pred, __selector,
-			     equal_split_tag());
+                             equal_split_tag());
       default:
         _GLIBCXX_PARALLEL_ASSERT(false);
         return std::make_pair(__begin1, __begin2);
@@ -90,9 +90,9 @@ template<typename _RAIter1,
  *  @return Place of finding in both sequences.
  */
 template<typename _RAIter1,
-	 typename _RAIter2,
-	 typename _Pred,
-	 typename _Selector>
+         typename _RAIter2,
+         typename _Pred,
+         typename _Selector>
   std::pair<_RAIter1, _RAIter2>
   __find_template(_RAIter1 __begin1,
                 _RAIter1 __end1,
@@ -125,7 +125,8 @@ template<typename _RAIter1,
           } //single
 
         _ThreadIndex __iam = omp_get_thread_num();
-        _DifferenceType __start = __borders[__iam], __stop = __borders[__iam + 1];
+        _DifferenceType __start = __borders[__iam],
+                        __stop = __borders[__iam + 1];
 
         _RAIter1 __i1 = __begin1 + __start;
         _RAIter2 __i2 = __begin2 + __start;
@@ -153,8 +154,7 @@ template<typename _RAIter1,
     delete[] __borders;
 
     return
-      std::pair<_RAIter1, _RAIter2>(__begin1 + __result,
-							      __begin2 + __result);
+      std::pair<_RAIter1, _RAIter2>(__begin1 + __result, __begin2 + __result);
   }
 
 #endif
@@ -178,15 +178,14 @@ template<typename _RAIter1,
  *  There are two main differences between the growing blocks and
  *  the constant-size blocks variants.
  *  1. For GB, the block size grows; for CSB, the block size is fixed.
-
  *  2. For GB, the blocks are allocated dynamically;
  *     for CSB, the blocks are allocated in a predetermined manner,
  *     namely spacial round-robin.
  */
 template<typename _RAIter1,
-	 typename _RAIter2,
-	 typename _Pred,
-	 typename _Selector>
+         typename _RAIter2,
+         typename _Pred,
+         typename _Selector>
   std::pair<_RAIter1, _RAIter2>
   __find_template(_RAIter1 __begin1, _RAIter1 __end1,
                 _RAIter2 __begin2, _Pred __pred, _Selector __selector,
@@ -231,7 +230,7 @@ template<typename _RAIter1,
 
         _DifferenceType __block_size = __s.find_initial_block_size;
         _DifferenceType __start =
-            __fetch_and_add<_DifferenceType>(&__next_block_start, __block_size);
+          __fetch_and_add<_DifferenceType>(&__next_block_start, __block_size);
 
         // Get new block, update pointer to next block.
         _DifferenceType __stop =
@@ -250,7 +249,8 @@ template<typename _RAIter1,
               }
 
             __local_result = __selector._M_sequential_algorithm(
-                __begin1 + __start, __begin1 + __stop, __begin2 + __start, __pred);
+                               __begin1 + __start, __begin1 + __stop,
+                               __begin2 + __start, __pred);
             if (__local_result.first != (__begin1 + __stop))
               {
                 omp_set_lock(&__result_lock);
@@ -259,20 +259,22 @@ template<typename _RAIter1,
                     __result = __local_result.first - __begin1;
 
                     // Result cannot be in future blocks, stop algorithm.
-                    __fetch_and_add<_DifferenceType>(&__next_block_start, __length);
+                    __fetch_and_add<_DifferenceType>(
+                      &__next_block_start, __length);
                   }
                   omp_unset_lock(&__result_lock);
               }
 
-            __block_size =
-	      std::min<_DifferenceType>(__block_size * __s.find_increasing_factor,
-					__s.find_maximum_block_size);
+            __block_size = std::min<_DifferenceType>(
+              __block_size * __s.find_increasing_factor,
+              __s.find_maximum_block_size);
 
             // Get new block, update pointer to next block.
             __start =
-	      __fetch_and_add<_DifferenceType>(&__next_block_start, __block_size);
+              __fetch_and_add<_DifferenceType>(
+                &__next_block_start, __block_size);
             __stop = ((__length < (__start + __block_size))
-		    ? __length : (__start + __block_size));
+                     ? __length : (__start + __block_size));
           }
       } //parallel
 
@@ -280,8 +282,7 @@ template<typename _RAIter1,
 
     // Return iterator on found element.
     return
-      std::pair<_RAIter1, _RAIter2>(__begin1 + __result,
-							      __begin2 + __result);
+      std::pair<_RAIter1, _RAIter2>(__begin1 + __result, __begin2 + __result);
   }
 
 #endif
@@ -307,9 +308,9 @@ template<typename _RAIter1,
  *  round-robin.
  */
 template<typename _RAIter1,
-	 typename _RAIter2,
-	 typename _Pred,
-	 typename _Selector>
+         typename _RAIter2,
+         typename _Pred,
+         typename _Selector>
   std::pair<_RAIter1, _RAIter2>
   __find_template(_RAIter1 __begin1, _RAIter1 __end1,
                 _RAIter2 __begin2, _Pred __pred, _Selector __selector,
@@ -329,8 +330,8 @@ template<typename _RAIter1,
 
     // Try it sequentially first.
     std::pair<_RAIter1, _RAIter2> __find_seq_result =
-      __selector._M_sequential_algorithm(__begin1, __begin1 + __sequential_search_size,
-                                    __begin2, __pred);
+      __selector._M_sequential_algorithm(
+        __begin1, __begin1 + __sequential_search_size, __begin2, __pred);
 
     if (__find_seq_result.first != (__begin1 + __sequential_search_size))
       return __find_seq_result;
@@ -384,7 +385,8 @@ template<typename _RAIter1,
 
             // Where to work.
             __start = __iteration_start + __iam * __block_size;
-            __stop = std::min<_DifferenceType>(__length, __start + __block_size);
+            __stop = std::min<_DifferenceType>(
+                       __length, __start + __block_size);
           }
       } //parallel
 
@@ -392,8 +394,7 @@ template<typename _RAIter1,
 
     // Return iterator on found element.
     return
-      std::pair<_RAIter1, _RAIter2>(__begin1 + __result,
-							      __begin2 + __result);
+      std::pair<_RAIter1, _RAIter2>(__begin1 + __result, __begin2 + __result);
   }
 #endif
 } // end namespace
diff --git a/libstdc++-v3/include/parallel/find_selectors.h b/libstdc++-v3/include/parallel/find_selectors.h
index 9445d51d45a..2b1e118a64f 100644
--- a/libstdc++-v3/include/parallel/find_selectors.h
+++ b/libstdc++-v3/include/parallel/find_selectors.h
@@ -55,7 +55,7 @@ namespace __gnu_parallel
      * @param __pred Find predicate.
      */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       bool 
       operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
       { return __pred(*__i1); }
@@ -67,13 +67,13 @@ namespace __gnu_parallel
      *  @param __pred Find predicate.
      */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       std::pair<_RAIter1, _RAIter2> 
       _M_sequential_algorithm(_RAIter1 __begin1,
-			   _RAIter1 __end1,
-			   _RAIter2 __begin2, _Pred __pred)
+                           _RAIter1 __end1,
+                           _RAIter2 __begin2, _Pred __pred)
       { return std::make_pair(find_if(__begin1, __end1, __pred,
-				      sequential_tag()), __begin2); }
+                                      sequential_tag()), __begin2); }
   };
 
   /** @brief Test predicate on two adjacent elements. */
@@ -85,12 +85,12 @@ namespace __gnu_parallel
      *  @param __pred Find predicate.
      */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       bool 
       operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
       {
-	// Passed end iterator is one short.
-	return __pred(*__i1, *(__i1 + 1));
+        // Passed end iterator is one short.
+        return __pred(*__i1, *(__i1 + 1));
       }
 
     /** @brief Corresponding sequential algorithm on a sequence.
@@ -100,18 +100,18 @@ namespace __gnu_parallel
      *  @param __pred Find predicate.
      */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       std::pair<_RAIter1, _RAIter2>
       _M_sequential_algorithm(_RAIter1 __begin1,
-			   _RAIter1 __end1,
-			   _RAIter2 __begin2, _Pred __pred)
+                           _RAIter1 __end1,
+                           _RAIter2 __begin2, _Pred __pred)
       {
-	// Passed end iterator is one short.
-	_RAIter1 spot = adjacent_find(__begin1, __end1 + 1,
-						   __pred, sequential_tag());
-	if (spot == (__end1 + 1))
-	  spot = __end1;
-	return std::make_pair(spot, __begin2);
+        // Passed end iterator is one short.
+        _RAIter1 spot = adjacent_find(__begin1, __end1 + 1,
+                                                   __pred, sequential_tag());
+        if (spot == (__end1 + 1))
+          spot = __end1;
+        return std::make_pair(spot, __begin2);
       }
   };
 
@@ -125,7 +125,7 @@ namespace __gnu_parallel
      *  @param __pred Find predicate. 
      */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       bool 
       operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
       { return !__pred(*__i1, *__i2); }
@@ -138,23 +138,24 @@ namespace __gnu_parallel
      *  @param __pred Find predicate. 
      */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       std::pair<_RAIter1, _RAIter2>
       _M_sequential_algorithm(_RAIter1 __begin1,
-			   _RAIter1 __end1,
-			   _RAIter2 __begin2, _Pred __pred)
-      { return mismatch(__begin1, __end1, __begin2, __pred, sequential_tag()); }
+                           _RAIter1 __end1,
+                           _RAIter2 __begin2, _Pred __pred)
+      { return mismatch(__begin1, __end1, __begin2, __pred, sequential_tag());
+        }
   };
 
 
   /** @brief Test predicate on several elements. */
-  template<typename _ForwardIterator>
+  template<typename _FIterator>
   struct __find_first_of_selector : public __generic_find_selector
   {
-    _ForwardIterator _M_begin;
-    _ForwardIterator _M_end;
+    _FIterator _M_begin;
+    _FIterator _M_end;
 
-    explicit __find_first_of_selector(_ForwardIterator __begin, _ForwardIterator __end)
+    explicit __find_first_of_selector(_FIterator __begin, _FIterator __end)
     : _M_begin(__begin), _M_end(__end) { }
 
     /** @brief Test on one position.
@@ -162,15 +163,15 @@ namespace __gnu_parallel
      *  @param __i2 _Iterator on second sequence (unused).
      *  @param __pred Find predicate. */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       bool 
       operator()(_RAIter1 __i1, _RAIter2 __i2, _Pred __pred)
       {
-	for (_ForwardIterator __pos_in_candidates = _M_begin;
-	     __pos_in_candidates != _M_end; ++__pos_in_candidates)
-	  if (__pred(*__i1, *__pos_in_candidates))
-	    return true;
-	return false;
+        for (_FIterator __pos_in_candidates = _M_begin;
+             __pos_in_candidates != _M_end; ++__pos_in_candidates)
+          if (__pred(*__i1, *__pos_in_candidates))
+            return true;
+        return false;
       }
 
     /** @brief Corresponding sequential algorithm on a sequence.
@@ -179,13 +180,16 @@ namespace __gnu_parallel
      *  @param __begin2 Begin iterator of second sequence.
      *  @param __pred Find predicate. */
     template<typename _RAIter1, typename _RAIter2,
-	     typename _Pred>
+             typename _Pred>
       std::pair<_RAIter1, _RAIter2>
       _M_sequential_algorithm(_RAIter1 __begin1,
-			   _RAIter1 __end1,
-			   _RAIter2 __begin2, _Pred __pred)
-      { return std::make_pair(find_first_of(__begin1, __end1, _M_begin, _M_end, __pred,
-					    sequential_tag()), __begin2); }
+                           _RAIter1 __end1,
+                           _RAIter2 __begin2, _Pred __pred)
+      {
+        return std::make_pair(
+                 find_first_of(__begin1, __end1, _M_begin, _M_end, __pred,
+                               sequential_tag()), __begin2);
+      }
   };
 }
 
diff --git a/libstdc++-v3/include/parallel/for_each.h b/libstdc++-v3/include/parallel/for_each.h
index 77162ed07c6..f1c9c23b8a5 100644
--- a/libstdc++-v3/include/parallel/for_each.h
+++ b/libstdc++-v3/include/parallel/for_each.h
@@ -56,41 +56,44 @@ namespace __gnu_parallel
    *  @param __bound Maximum number of elements processed.
    *  @param __parallelism_tag Parallelization method */
   template<typename _IIter, typename _UserOp,
-	   typename _Functionality, typename _Red, typename _Result>
+           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)
+                                      _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);
+        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);
+        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);
+        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);
   }
 }
 
diff --git a/libstdc++-v3/include/parallel/for_each_selectors.h b/libstdc++-v3/include/parallel/for_each_selectors.h
index ae12c945d3c..9b3bb6b5703 100644
--- a/libstdc++-v3/include/parallel/for_each_selectors.h
+++ b/libstdc++-v3/include/parallel/for_each_selectors.h
@@ -59,10 +59,10 @@ namespace __gnu_parallel
       template<typename _Op>
         bool
         operator()(_Op& __o, _It __i)
-	{
-	  __o(*__i);
-	  return true;
-	}
+        {
+          __o(*__i);
+          return true;
+        }
     };
 
   /** @brief std::generate() selector. */
@@ -76,9 +76,9 @@ namespace __gnu_parallel
         bool
         operator()(_Op& __o, _It __i)
         {
-	  *__i = __o();
-	  return true;
-	}
+          *__i = __o();
+          return true;
+        }
     };
 
   /** @brief std::fill() selector. */
@@ -91,10 +91,10 @@ namespace __gnu_parallel
       template<typename Val>
         bool
         operator()(Val& __v, _It __i)
-	{
-	  *__i = __v;
-	  return true;
-	}
+        {
+          *__i = __v;
+          return true;
+        }
     };
 
   /** @brief std::transform() __selector, one input sequence variant. */
@@ -107,10 +107,10 @@ namespace __gnu_parallel
       template<typename _Op>
         bool
         operator()(_Op& __o, _It __i)
-	{
-	  *__i.second = __o(*__i.first);
-	  return true;
-	}
+        {
+          *__i.second = __o(*__i.first);
+          return true;
+        }
     };
 
   /** @brief std::transform() __selector, two input sequences variant. */
@@ -123,10 +123,10 @@ namespace __gnu_parallel
       template<typename _Op>
         bool
         operator()(_Op& __o, _It __i)
-	{
-	  *__i._M_third = __o(*__i._M_first, *__i._M_second);
-	  return true;
-	}
+        {
+          *__i._M_third = __o(*__i._M_first, *__i._M_second);
+          return true;
+        }
     };
 
   /** @brief std::replace() selector. */
@@ -147,9 +147,9 @@ namespace __gnu_parallel
       bool
       operator()(_Tp& __v, _It __i)
       {
-	if (*__i == __v)
-	  *__i = __new_val;
-	return true;
+        if (*__i == __v)
+          *__i = __new_val;
+        return true;
       }
     };
 
@@ -171,9 +171,9 @@ namespace __gnu_parallel
       bool
       operator()(_Op& __o, _It __i)
       {
-	if (__o(*__i))
-	  *__i = __new_val;
-	return true;
+        if (__o(*__i))
+          *__i = __new_val;
+        return true;
       }
     };
 
@@ -188,7 +188,7 @@ namespace __gnu_parallel
       template<typename Val>
         _Diff
         operator()(Val& __v, _It __i)
-	{ return (__v == *__i) ? 1 : 0; }
+        { return (__v == *__i) ? 1 : 0; }
     };
 
   /** @brief std::count_if () selector. */
@@ -202,7 +202,7 @@ namespace __gnu_parallel
       template<typename _Op>
         _Diff
         operator()(_Op& __o, _It __i)
-	{ return (__o(*__i)) ? 1 : 0; }
+        { return (__o(*__i)) ? 1 : 0; }
     };
 
   /** @brief std::accumulate() selector. */
@@ -214,8 +214,9 @@ namespace __gnu_parallel
        *  @param __i iterator referencing object.
        *  @return The current value. */
       template<typename _Op>
-        typename std::iterator_traits<_It>::value_type operator()(_Op __o, _It __i)
-	{ return *__i; }
+        typename std::iterator_traits<_It>::value_type
+        operator()(_Op __o, _It __i)
+        { return *__i; }
     };
 
   /** @brief std::inner_product() selector. */
@@ -242,11 +243,11 @@ namespace __gnu_parallel
       template<typename _Op>
         _Tp
         operator()(_Op __mult, _It __current)
-	{
-	  typename std::iterator_traits<_It>::difference_type __position
-	    = __current - __begin1_iterator;
-	  return __mult(*__current, *(begin2_iterator + __position));
-	}
+        {
+          typename std::iterator_traits<_It>::difference_type __position
+            = __current - __begin1_iterator;
+          return __mult(*__current, *(begin2_iterator + __position));
+        }
     };
 
   /** @brief Selector that just returns the passed iterator. */
@@ -260,24 +261,25 @@ namespace __gnu_parallel
       template<typename _Op>
         _It
         operator()(_Op __o, _It __i)
-	{ return __i; }
+        { return __i; }
     };
 
   /** @brief Selector that returns the difference between two adjacent
    *  __elements.
    */
   template<typename _It>
-    struct __adjacent_difference_selector : public __generic_for_each_selector<_It>
+    struct __adjacent_difference_selector :
+           public __generic_for_each_selector<_It>
     {
       template<typename _Op>
         bool
         operator()(_Op& __o, _It __i)
-	{
-	  typename _It::first_type __go_back_one = __i.first;
-	  --__go_back_one;
-	  *__i.__second = __o(*__i.__first, *__go_back_one);
-	  return true;
-	}
+        {
+          typename _It::first_type __go_back_one = __i.first;
+          --__go_back_one;
+          *__i.__second = __o(*__i.__first, *__go_back_one);
+          return true;
+        }
     };
 
   // XXX move into type_traits?
@@ -315,10 +317,10 @@ namespace __gnu_parallel
       _It
       operator()(_It __x, _It __y)
       {
-	if (__comp(*__x, *__y))
-	  return __x;
-	else
-	  return __y;
+        if (__comp(*__x, *__y))
+          return __x;
+        else
+          return __y;
       }
     };
 
@@ -334,10 +336,10 @@ namespace __gnu_parallel
       _It
       operator()(_It __x, _It __y)
       {
-	if (__comp(*__x, *__y))
-	  return __y;
-	else
-	  return __x;
+        if (__comp(*__x, *__y))
+          return __y;
+        else
+          return __x;
       }
     };
 
@@ -353,7 +355,7 @@ namespace __gnu_parallel
       template<typename _Result, typename _Addend>
         _Result
         operator()(const _Result& __x, const _Addend& __y)
-	{ return __binop(__x, __y); }
+        { return __binop(__x, __y); }
     };
 }
 
diff --git a/libstdc++-v3/include/parallel/iterator.h b/libstdc++-v3/include/parallel/iterator.h
index c49ade2ca75..013855076f4 100644
--- a/libstdc++-v3/include/parallel/iterator.h
+++ b/libstdc++-v3/include/parallel/iterator.h
@@ -40,7 +40,8 @@ namespace __gnu_parallel
   /** @brief A pair of iterators. The usual iterator operations are
    *  applied to both child iterators.
    */
-  template<typename _Iterator1, typename _Iterator2, typename _IteratorCategory>
+  template<typename _Iterator1, typename _Iterator2,
+           typename _IteratorCategory>
     class _IteratorPair : public std::pair<_Iterator1, _Iterator2>
     {
     private:
@@ -57,16 +58,16 @@ namespace __gnu_parallel
 
       _IteratorPair() { }
 
-      _IteratorPair(const _Iterator1& __first, const _Iterator2& __second) 
+      _IteratorPair(const _Iterator1& __first, const _Iterator2& __second)
       : _Base(__first, __second) { }
 
       // Pre-increment operator.
       _IteratorPair&
       operator++()
       {
-	++_Base::first;
-	++_Base::second;
-	return *this;
+        ++_Base::first;
+        ++_Base::second;
+        return *this;
       }
 
       // Post-increment operator.
@@ -78,9 +79,9 @@ namespace __gnu_parallel
       _IteratorPair&
       operator--()
       {
-	--_Base::first;
-	--_Base::second;
-	return *this;
+        --_Base::first;
+        --_Base::second;
+        return *this;
       }
 
       // Post-decrement operator.
@@ -95,14 +96,15 @@ namespace __gnu_parallel
       _IteratorPair&
       operator=(const _IteratorPair& __other)
       {
-	_Base::first = __other.first;
-	_Base::second = __other.second;
-	return *this;
+        _Base::first = __other.first;
+        _Base::second = __other.second;
+        return *this;
       }
 
       _IteratorPair
       operator+(difference_type __delta) const
-      { return _IteratorPair(_Base::first + __delta, _Base::second + __delta); }
+      { return _IteratorPair(_Base::first + __delta, _Base::second + __delta);
+        }
 
       difference_type
       operator-(const _IteratorPair& __other) const
@@ -114,7 +116,7 @@ namespace __gnu_parallel
       applied to all three child iterators.
    */
   template<typename _Iterator1, typename _Iterator2, typename _Iterator3,
-	   typename _IteratorCategory>
+           typename _IteratorCategory>
     class _IteratorTriple
     {
     public:
@@ -132,21 +134,21 @@ namespace __gnu_parallel
       _IteratorTriple() { }
 
       _IteratorTriple(const _Iterator1& __first, const _Iterator2& __second,
-		      const _Iterator3& __third)
+                      const _Iterator3& __third)
       {
-	_M_first = __first;
-	_M_second = __second;
-	_M_third = __third;
+        _M_first = __first;
+        _M_second = __second;
+        _M_third = __third;
       }
 
       // Pre-increment operator.
       _IteratorTriple&
       operator++()
       {
-	++_M_first;
-	++_M_second;
-	++_M_third;
-	return *this;
+        ++_M_first;
+        ++_M_second;
+        ++_M_third;
+        return *this;
       }
 
       // Post-increment operator.
@@ -158,10 +160,10 @@ namespace __gnu_parallel
       _IteratorTriple&
       operator--()
       {
-	--_M_first;
-	--_M_second;
-	--_M_third;
-	return *this;
+        --_M_first;
+        --_M_second;
+        --_M_third;
+        return *this;
       }
 
       // Post-decrement operator.
@@ -176,15 +178,16 @@ namespace __gnu_parallel
       _IteratorTriple&
       operator=(const _IteratorTriple& __other)
       {
-	_M_first = __other._M_first;
-	_M_second = __other._M_second;
-	_M_third = __other._M_third;
-	return *this;
+        _M_first = __other._M_first;
+        _M_second = __other._M_second;
+        _M_third = __other._M_third;
+        return *this;
       }
 
       _IteratorTriple
       operator+(difference_type __delta) const
-      { return _IteratorTriple(_M_first + __delta, _M_second + __delta, _M_third + __delta); }
+      { return _IteratorTriple(_M_first + __delta, _M_second + __delta,
+                               _M_third + __delta); }
 
       difference_type
       operator-(const _IteratorTriple& __other) const
diff --git a/libstdc++-v3/include/parallel/list_partition.h b/libstdc++-v3/include/parallel/list_partition.h
index 5065a86f9a0..7eed96b4a0d 100644
--- a/libstdc++-v3/include/parallel/list_partition.h
+++ b/libstdc++-v3/include/parallel/list_partition.h
@@ -48,17 +48,17 @@ namespace __gnu_parallel
   template<typename _IIter>
     void
     __shrink_and_double(std::vector<_IIter>& __os_starts,
-		      size_t& __count_to_two, size_t& __range_length,
-		      const bool __make_twice)
+                      size_t& __count_to_two, size_t& __range_length,
+                      const bool __make_twice)
     {
       ++__count_to_two;
       if (not __make_twice or __count_to_two < 2)
-	__shrink(__os_starts, __count_to_two, __range_length);
+        __shrink(__os_starts, __count_to_two, __range_length);
       else
-	{
-	  __os_starts.resize((__os_starts.size() - 1) * 2 + 1);
-	  __count_to_two = 0;
-	}
+        {
+          __os_starts.resize((__os_starts.size() - 1) * 2 + 1);
+          __count_to_two = 0;
+        }
     }
 
   /** @brief Combines two ranges into one and thus halves the number of ranges.
@@ -68,11 +68,11 @@ namespace __gnu_parallel
   template<typename _IIter>
     void
     __shrink(std::vector<_IIter>& __os_starts, size_t& __count_to_two,
-	   size_t& __range_length)
+           size_t& __range_length)
     {
       for (typename std::vector<_IIter>::size_type __i = 0;
-	   __i <= (__os_starts.size() / 2); ++__i)
-	__os_starts[__i] = __os_starts[__i * 2];
+           __i <= (__os_starts.size() / 2); ++__i)
+        __os_starts[__i] = __os_starts[__i * 2];
       __range_length *= 2;
     }
 
@@ -98,17 +98,17 @@ namespace __gnu_parallel
   template<typename _IIter, typename _FunctorType>
     size_t
     list_partition(const _IIter __begin, const _IIter __end,
-		   _IIter* __starts, size_t* __lengths, const int __num_parts,
-		   _FunctorType& __f, int __oversampling = 0)
+                   _IIter* __starts, size_t* __lengths, const int __num_parts,
+                   _FunctorType& __f, int __oversampling = 0)
     {
       bool __make_twice = false;
 
       // The resizing algorithm is chosen according to the oversampling factor.
       if (__oversampling == 0)
-	{
-	  __make_twice = true;
-	  __oversampling = 1;
-	}
+        {
+          __make_twice = true;
+          __oversampling = 1;
+        }
 
       std::vector<_IIter> __os_starts(2 * __oversampling * __num_parts + 1);
 
@@ -119,27 +119,28 @@ namespace __gnu_parallel
       size_t __range_length = 1;
       size_t __count_to_two = 0;
       while (__it != __end)
-	{
-	  __cur = __next;
-	  for (; __cur < __os_starts.size() and __it != __end; ++__cur)
-	    {
-	      for (__dist_limit += __range_length;
-		   __dist < __dist_limit and __it != __end; ++__dist)
-		{
-		  __f(__it);
-		  ++__it;
-		}
-	      __os_starts[__cur] = __it;
-	    }
-
-	  // Must compare for end and not __cur < __os_starts.size() , because
-	  // __cur could be == __os_starts.size() as well
-	  if (__it == __end)
-	    break;
-
-	  __shrink_and_double(__os_starts, __count_to_two, __range_length, __make_twice);
-	  __next = __os_starts.size() / 2 + 1;
-	}
+        {
+          __cur = __next;
+          for (; __cur < __os_starts.size() and __it != __end; ++__cur)
+            {
+              for (__dist_limit += __range_length;
+                   __dist < __dist_limit and __it != __end; ++__dist)
+                {
+                  __f(__it);
+                  ++__it;
+                }
+              __os_starts[__cur] = __it;
+            }
+
+          // Must compare for end and not __cur < __os_starts.size() , because
+          // __cur could be == __os_starts.size() as well
+          if (__it == __end)
+            break;
+
+          __shrink_and_double(__os_starts, __count_to_two, __range_length,
+                              __make_twice);
+          __next = __os_starts.size() / 2 + 1;
+        }
 
       // Calculation of the parts (one must be extracted from __current
       // because the partition beginning at __end, consists only of
@@ -152,19 +153,20 @@ namespace __gnu_parallel
 
       // Smallest partitions.
       for (int __i = 1; __i < (__num_parts + 1 - __size_greater); ++__i)
-	{
-	  __lengths[__i - 1] =  __size_part * __range_length;
-	  __index += __size_part;
-	  __starts[__i] = __os_starts[__index];
-	}
+        {
+          __lengths[__i - 1] =  __size_part * __range_length;
+          __index += __size_part;
+          __starts[__i] = __os_starts[__index];
+        }
 
       // Biggest partitions.
-      for (int __i = __num_parts + 1 - __size_greater; __i <= __num_parts; ++__i)
-	{
-	  __lengths[__i - 1] =  (__size_part+1) * __range_length;
-	  __index += (__size_part+1);
-	  __starts[__i] = __os_starts[__index];
-	}
+      for (int __i = __num_parts + 1 - __size_greater; __i <= __num_parts;
+           ++__i)
+        {
+          __lengths[__i - 1] =  (__size_part+1) * __range_length;
+          __index += (__size_part+1);
+          __starts[__i] = __os_starts[__index];
+        }
 
       // Correction of the end size (the end iteration has not finished).
       __lengths[__num_parts - 1] -= (__dist_limit - __dist);
diff --git a/libstdc++-v3/include/parallel/losertree.h b/libstdc++-v3/include/parallel/losertree.h
index 33a4070e9a8..239aac8c057 100644
--- a/libstdc++-v3/include/parallel/losertree.h
+++ b/libstdc++-v3/include/parallel/losertree.h
@@ -106,7 +106,8 @@ public:
     _M_offset = _M_k;
 
     // Avoid default-constructing _M_losers[]._M_key
-    _M_losers = static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser)));
+    _M_losers
+        = static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser)));
     for (unsigned int __i = _M_ik - 1; __i < _M_k; ++__i)
       _M_losers[__i + _M_k]._M_sup = true;
 
@@ -187,7 +188,7 @@ public:
         unsigned int __right = __init_winner (2 * __root + 1);
         if (_M_losers[__right]._M_sup
             || (!_M_losers[__left]._M_sup
-              && !_M_comp(_M_losers[__right]._M_key, _M_losers[__left]._M_key)))
+             && !_M_comp(_M_losers[__right]._M_key, _M_losers[__left]._M_key)))
           {
             // Left one is less or equal.
             _M_losers[__root] = _M_losers[__right];
@@ -223,7 +224,8 @@ public:
     for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
       {
         // The smaller one gets promoted, ties are broken by _M_source.
-        if ((_M_sup && (!_M_losers[__pos]._M_sup || _M_losers[__pos]._M_source < _M_source))
+        if ((_M_sup && (!_M_losers[__pos]._M_sup
+                || _M_losers[__pos]._M_source < _M_source))
               || (!_M_sup && !_M_losers[__pos]._M_sup
                 && ((_M_comp(_M_losers[__pos]._M_key, _M_key))
                   || (!_M_comp(_M_key, _M_losers[__pos]._M_key)
@@ -280,9 +282,9 @@ public:
       {
         unsigned int __left = __init_winner (2 * __root);
         unsigned int __right = __init_winner (2 * __root + 1);
-        if (_M_losers[__right]._M_sup ||
-            (!_M_losers[__left]._M_sup
-              && !_M_comp(_M_losers[__right]._M_key, _M_losers[__left]._M_key)))
+        if (_M_losers[__right]._M_sup
+           || (!_M_losers[__left]._M_sup
+             && !_M_comp(_M_losers[__right]._M_key, _M_losers[__left]._M_key)))
           {
             // Left one is less or equal.
             _M_losers[__root] = _M_losers[__right];
@@ -320,7 +322,8 @@ public:
     for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
     {
         // The smaller one gets promoted.
-      if (_M_sup || (!_M_losers[__pos]._M_sup && _M_comp(_M_losers[__pos]._M_key, _M_key)))
+      if (_M_sup || (!_M_losers[__pos]._M_sup
+                     && _M_comp(_M_losers[__pos]._M_key, _M_key)))
       {
             // The other one is smaller.
         std::swap(_M_losers[__pos]._M_sup, _M_sup);
@@ -414,8 +417,9 @@ public:
         unsigned int __left = __init_winner (2 * __root);
         unsigned int __right = __init_winner (2 * __root + 1);
         if (_M_losers[__right]._M_sup
-            || (!_M_losers[__left]._M_sup && !_M_comp(*_M_losers[__right]._M_keyp,
-                                          *_M_losers[__left]._M_keyp)))
+            || (!_M_losers[__left]._M_sup
+                && !_M_comp(*_M_losers[__right]._M_keyp,
+                            *_M_losers[__left]._M_keyp)))
           {
             // Left one is less or equal.
             _M_losers[__root] = _M_losers[__right];
@@ -445,7 +449,8 @@ public:
     for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
       {
         // The smaller one gets promoted, ties are broken by _M_source.
-        if ((_M_sup && (!_M_losers[__pos]._M_sup || _M_losers[__pos]._M_source < _M_source)) ||
+        if ((_M_sup && (!_M_losers[__pos]._M_sup ||
+                _M_losers[__pos]._M_source < _M_source)) ||
               (!_M_sup && !_M_losers[__pos]._M_sup &&
               ((_M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)) ||
                 (!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp)
@@ -495,7 +500,8 @@ public:
         unsigned int __right = __init_winner (2 * __root + 1);
         if (_M_losers[__right]._M_sup
               || (!_M_losers[__left]._M_sup
-                && !_M_comp(*_M_losers[__right]._M_keyp, *_M_losers[__left]._M_keyp)))
+                && !_M_comp(*_M_losers[__right]._M_keyp,
+                            *_M_losers[__left]._M_keyp)))
           {
             // Left one is less or equal.
             _M_losers[__root] = _M_losers[__right];
@@ -525,7 +531,8 @@ public:
     for (unsigned int __pos = (_M_k + _M_source) / 2; __pos > 0; __pos /= 2)
       {
         // The smaller one gets promoted.
-        if (_M_sup || (!_M_losers[__pos]._M_sup && _M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)))
+        if (_M_sup || (!_M_losers[__pos]._M_sup
+                       && _M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)))
           {
             // The other one is smaller.
             std::swap(_M_losers[__pos]._M_sup, _M_sup);
@@ -576,7 +583,8 @@ public:
     _M_k = 1 << (__log2(_M_ik - 1) + 1);
     _M_offset = _M_k;
     // Avoid default-constructing _M_losers[]._M_key
-    _M_losers = static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser)));
+    _M_losers
+        = static_cast<_Loser*>(::operator new(2 * _M_k * sizeof(_Loser)));
 
     for (unsigned int __i = _M_k + _M_ik - 1; __i < (2 * _M_k); ++__i)
       {
@@ -677,7 +685,8 @@ public:
       {
         // The smaller one gets promoted, ties are broken by _M_source.
         if (_M_comp(_M_losers[__pos]._M_key, _M_key)
-              || (!_M_comp(_M_key, _M_losers[__pos]._M_key) && _M_losers[__pos]._M_source < _M_source))
+              || (!_M_comp(_M_key, _M_losers[__pos]._M_key)
+                  && _M_losers[__pos]._M_source < _M_source))
           {
             // The other one is smaller.
             std::swap(_M_losers[__pos]._M_source, _M_source);
@@ -914,7 +923,8 @@ public:
       {
         // The smaller one gets promoted, ties are broken by _M_source.
         if (_M_comp(*_M_losers[__pos]._M_keyp, *_M_keyp)
-          || (!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp) && _M_losers[__pos]._M_source < _M_source))
+          || (!_M_comp(*_M_keyp, *_M_losers[__pos]._M_keyp)
+              && _M_losers[__pos]._M_source < _M_source))
           {
             // The other one is smaller.
             std::swap(_M_losers[__pos]._M_source, _M_source);
diff --git a/libstdc++-v3/include/parallel/merge.h b/libstdc++-v3/include/parallel/merge.h
index 7b61ca692e8..b2d8996ae5a 100644
--- a/libstdc++-v3/include/parallel/merge.h
+++ b/libstdc++-v3/include/parallel/merge.h
@@ -51,36 +51,36 @@ namespace __gnu_parallel
    * @param __comp Comparator.
    * @return Output end iterator. */
   template<typename _RAIter1, typename _RAIter2,
-	   typename _OutputIterator, typename _DifferenceTp,
-	   typename _Compare>
+           typename _OutputIterator, typename _DifferenceTp,
+           typename _Compare>
     _OutputIterator
     __merge_advance_usual(_RAIter1& __begin1,
-			_RAIter1 __end1,
-			_RAIter2& __begin2,
-			_RAIter2 __end2, _OutputIterator __target,
-			_DifferenceTp __max_length, _Compare __comp)
+                        _RAIter1 __end1,
+                        _RAIter2& __begin2,
+                        _RAIter2 __end2, _OutputIterator __target,
+                        _DifferenceTp __max_length, _Compare __comp)
     {
       typedef _DifferenceTp _DifferenceType;
       while (__begin1 != __end1 && __begin2 != __end2 && __max_length > 0)
-	{
-	  // array1[__i1] < array0[i0]
-	  if (__comp(*__begin2, *__begin1))
-	    *__target++ = *__begin2++;
-	  else
-	    *__target++ = *__begin1++;
-	  --__max_length;
-	}
+        {
+          // array1[__i1] < array0[i0]
+          if (__comp(*__begin2, *__begin1))
+            *__target++ = *__begin2++;
+          else
+            *__target++ = *__begin1++;
+          --__max_length;
+        }
 
       if (__begin1 != __end1)
-	{
-	  __target = std::copy(__begin1, __begin1 + __max_length, __target);
-	  __begin1 += __max_length;
-	}
+        {
+          __target = std::copy(__begin1, __begin1 + __max_length, __target);
+          __begin1 += __max_length;
+        }
       else
-	{
-	  __target = std::copy(__begin2, __begin2 + __max_length, __target);
-	  __begin2 += __max_length;
-	}
+        {
+          __target = std::copy(__begin2, __begin2 + __max_length, __target);
+          __begin2 += __max_length;
+        }
       return __target;
     }
 
@@ -100,56 +100,56 @@ namespace __gnu_parallel
    * @param __comp Comparator.
    * @return Output end iterator. */
   template<typename _RAIter1, typename _RAIter2,
-	   typename _OutputIterator, typename _DifferenceTp,
-	   typename _Compare>
+           typename _OutputIterator, typename _DifferenceTp,
+           typename _Compare>
     _OutputIterator
     __merge_advance_movc(_RAIter1& __begin1,
-		       _RAIter1 __end1,
-		       _RAIter2& __begin2,
-		       _RAIter2 __end2,
-		       _OutputIterator __target,
-		       _DifferenceTp __max_length, _Compare __comp)
+                       _RAIter1 __end1,
+                       _RAIter2& __begin2,
+                       _RAIter2 __end2,
+                       _OutputIterator __target,
+                       _DifferenceTp __max_length, _Compare __comp)
     {
       typedef _DifferenceTp _DifferenceType;
       typedef typename std::iterator_traits<_RAIter1>::value_type
-	value_type1;
+        value_type1;
       typedef typename std::iterator_traits<_RAIter2>::value_type
-	value_type2;
+        value_type2;
 
 #if _GLIBCXX_ASSERTIONS
       _GLIBCXX_PARALLEL_ASSERT(__max_length >= 0);
 #endif
 
       while (__begin1 != __end1 && __begin2 != __end2 && __max_length > 0)
-	{
-	  _RAIter1 __next1 = __begin1 + 1;
-	  _RAIter2 __next2 = __begin2 + 1;
-	  value_type1 __element1 = *__begin1;
-	  value_type2 __element2 = *__begin2;
+        {
+          _RAIter1 __next1 = __begin1 + 1;
+          _RAIter2 __next2 = __begin2 + 1;
+          value_type1 __element1 = *__begin1;
+          value_type2 __element2 = *__begin2;
 
-	  if (__comp(__element2, __element1))
-	    {
-	      __element1 = __element2;
-	      __begin2 = __next2;
-	    }
-	  else
-	    __begin1 = __next1;
+          if (__comp(__element2, __element1))
+            {
+              __element1 = __element2;
+              __begin2 = __next2;
+            }
+          else
+            __begin1 = __next1;
 
-	  *__target = __element1;
+          *__target = __element1;
 
-	  ++__target;
-	  --__max_length;
-	}
+          ++__target;
+          --__max_length;
+        }
       if (__begin1 != __end1)
-	{
-	  __target = std::copy(__begin1, __begin1 + __max_length, __target);
-	  __begin1 += __max_length;
-	}
+        {
+          __target = std::copy(__begin1, __begin1 + __max_length, __target);
+          __begin1 += __max_length;
+        }
       else
-	{
-	  __target = std::copy(__begin2, __begin2 + __max_length, __target);
-	  __begin2 += __max_length;
-	}
+        {
+          __target = std::copy(__begin2, __begin2 + __max_length, __target);
+          __begin2 += __max_length;
+        }
       return __target;
     }
 
@@ -168,18 +168,18 @@ namespace __gnu_parallel
    *  @param __comp Comparator.
    *  @return Output end iterator. */
   template<typename _RAIter1, typename _RAIter2,
-	   typename _OutputIterator, typename _DifferenceTp,
-	   typename _Compare>
+           typename _OutputIterator, typename _DifferenceTp,
+           typename _Compare>
     inline _OutputIterator
     __merge_advance(_RAIter1& __begin1, _RAIter1 __end1,
-		  _RAIter2& __begin2, _RAIter2 __end2,
-		  _OutputIterator __target, _DifferenceTp __max_length,
-		  _Compare __comp)
+                  _RAIter2& __begin2, _RAIter2 __end2,
+                  _OutputIterator __target, _DifferenceTp __max_length,
+                  _Compare __comp)
     {
       _GLIBCXX_CALL(__max_length)
 
       return __merge_advance_movc(__begin1, __end1, __begin2, __end2, __target,
-				__max_length, __comp);
+                                __max_length, __comp);
     }
 
   /** @brief Merge routine fallback to sequential in case the
@@ -193,19 +193,19 @@ namespace __gnu_parallel
       *  @param __comp Comparator.
       *  @return Output end iterator. */
   template<typename _RAIter1, typename _RAIter2,
-	   typename _RAIter3, typename _Compare>
+           typename _RAIter3, typename _Compare>
     inline _RAIter3
     __parallel_merge_advance(_RAIter1& __begin1,
-			   _RAIter1 __end1,
-			   _RAIter2& __begin2,
-			   // different iterators, parallel implementation
-			   // not available			   
-			   _RAIter2 __end2,
-			   _RAIter3 __target, typename
-			   std::iterator_traits<_RAIter1>::
-			   difference_type __max_length, _Compare __comp)
+                           _RAIter1 __end1,
+                           _RAIter2& __begin2,
+                           // different iterators, parallel implementation
+                           // not available                        
+                           _RAIter2 __end2,
+                           _RAIter3 __target, typename
+                           std::iterator_traits<_RAIter1>::
+                           difference_type __max_length, _Compare __comp)
     { return __merge_advance(__begin1, __end1, __begin2, __end2, __target,
-			   __max_length, __comp); }
+                           __max_length, __comp); }
 
   /** @brief Parallel merge routine being able to merge only the @__c
    * __max_length smallest elements.
@@ -223,28 +223,28 @@ namespace __gnu_parallel
    *  @return Output end iterator.
    */
   template<typename _RAIter1, typename _RAIter3,
-	   typename _Compare>
+           typename _Compare>
     inline _RAIter3
     __parallel_merge_advance(_RAIter1& __begin1,
-			   _RAIter1 __end1,
-			   _RAIter1& __begin2,
-			   _RAIter1 __end2,
-			   _RAIter3 __target, typename
-			   std::iterator_traits<_RAIter1>::
-			   difference_type __max_length, _Compare __comp)
+                           _RAIter1 __end1,
+                           _RAIter1& __begin2,
+                           _RAIter1 __end2,
+                           _RAIter3 __target, typename
+                           std::iterator_traits<_RAIter1>::
+                           difference_type __max_length, _Compare __comp)
     {
       typedef typename
           std::iterator_traits<_RAIter1>::value_type _ValueType;
       typedef typename std::iterator_traits<_RAIter1>::
-	difference_type _DifferenceType1 /* == difference_type2 */;
+        difference_type _DifferenceType1 /* == difference_type2 */;
       typedef typename std::iterator_traits<_RAIter3>::
-	difference_type _DifferenceType3;
+        difference_type _DifferenceType3;
       typedef typename std::pair<_RAIter1, _RAIter1>
         _IteratorPair;
 
       _IteratorPair
-	seqs[2] = { std::make_pair(__begin1, __end1),
-		    std::make_pair(__begin2, __end2) };
+        seqs[2] = { std::make_pair(__begin1, __end1),
+                    std::make_pair(__begin2, __end2) };
       _RAIter3
         __target_end = parallel_multiway_merge
           < /* __stable = */ true, /* __sentinels = */ false>(
@@ -256,6 +256,6 @@ namespace __gnu_parallel
 
       return __target_end;
     }
-}	//namespace __gnu_parallel
+}       //namespace __gnu_parallel
 
 #endif /* _GLIBCXX_PARALLEL_MERGE_H */
diff --git a/libstdc++-v3/include/parallel/multiseq_selection.h b/libstdc++-v3/include/parallel/multiseq_selection.h
index 148b4ab65e4..539695fc766 100644
--- a/libstdc++-v3/include/parallel/multiseq_selection.h
+++ b/libstdc++-v3/include/parallel/multiseq_selection.h
@@ -53,7 +53,8 @@ namespace __gnu_parallel
   /** @brief Compare __a pair of types lexicographically, ascending. */
   template<typename _T1, typename _T2, typename _Compare>
     class _Lexicographic
-    : public std::binary_function<std::pair<_T1, _T2>, std::pair<_T1, _T2>, bool>
+    : public std::binary_function<
+                                std::pair<_T1, _T2>, std::pair<_T1, _T2>, bool>
     {
     private:
       _Compare& _M_comp;
@@ -63,16 +64,16 @@ namespace __gnu_parallel
 
       bool
       operator()(const std::pair<_T1, _T2>& __p1,
-		 const std::pair<_T1, _T2>& __p2) const
+                 const std::pair<_T1, _T2>& __p2) const
       {
-	if (_M_comp(__p1.first, __p2.first))
-	  return true;
+        if (_M_comp(__p1.first, __p2.first))
+          return true;
 
-	if (_M_comp(__p2.first, __p1.first))
-	  return false;
+        if (_M_comp(__p2.first, __p1.first))
+          return false;
 
-	// Firsts are equal.
-	return __p1.second < __p2.second;
+        // Firsts are equal.
+        return __p1.second < __p2.second;
       }
     };
 
@@ -88,16 +89,16 @@ namespace __gnu_parallel
 
       bool
       operator()(const std::pair<_T1, _T2>& __p1,
-		 const std::pair<_T1, _T2>& __p2) const
+                 const std::pair<_T1, _T2>& __p2) const
       {
-	if (_M_comp(__p2.first, __p1.first))
-	  return true;
+        if (_M_comp(__p2.first, __p1.first))
+          return true;
 
-	if (_M_comp(__p1.first, __p2.first))
-	  return false;
+        if (_M_comp(__p1.first, __p2.first))
+          return false;
 
-	// Firsts are equal.
-	return __p2.second < __p1.second;
+        // Firsts are equal.
+        return __p2.second < __p1.second;
       }
     };
 
@@ -133,7 +134,7 @@ namespace __gnu_parallel
       typedef typename std::iterator_traits<_RanSeqs>::value_type::first_type
         _It;
       typedef typename std::iterator_traits<_It>::difference_type
-	       _DifferenceType;
+               _DifferenceType;
       typedef typename std::iterator_traits<_It>::value_type _ValueType;
 
       _Lexicographic<_ValueType, int, _Compare> __lcomp(__comp);
@@ -146,9 +147,11 @@ namespace __gnu_parallel
 
       for (int __i = 0; __i < __m; __i++)
         {
-          __N += std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second);
+          __N += std::distance(__begin_seqs[__i].first,
+                               __begin_seqs[__i].second);
           _GLIBCXX_PARALLEL_ASSERT(
-            std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second) > 0);
+            std::distance(__begin_seqs[__i].first,
+                          __begin_seqs[__i].second) > 0);
         }
 
       if (__rank == __N)
@@ -172,10 +175,11 @@ namespace __gnu_parallel
       __ns[0] = std::distance(__begin_seqs[0].first, __begin_seqs[0].second);
       __nmax = __ns[0];
       for (int __i = 0; __i < __m; __i++)
-	{
-	  __ns[__i] = std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second);
-	  __nmax = std::max(__nmax, __ns[__i]);
-	}
+        {
+          __ns[__i] = std::distance(__begin_seqs[__i].first,
+                                    __begin_seqs[__i].second);
+          __nmax = std::max(__nmax, __ns[__i]);
+        }
 
       __r = __log2(__nmax) + 1;
 
@@ -187,10 +191,10 @@ namespace __gnu_parallel
       __N = __l * __m;
 
       for (int __i = 0; __i < __m; __i++)
-	{
-	  __a[__i] = 0;
-	  __b[__i] = __l;
-	}
+        {
+          __a[__i] = 0;
+          __b[__i] = __l;
+        }
       __n = __l / 2;
 
       // Invariants:
@@ -202,124 +206,128 @@ namespace __gnu_parallel
       std::vector<std::pair<_ValueType, int> > __sample;
 
       for (int __i = 0; __i < __m; __i++)
-	if (__n < __ns[__i])	//__sequence long enough
-	  __sample.push_back(std::make_pair(__S(__i)[__n], __i));
+        if (__n < __ns[__i])    //__sequence long enough
+          __sample.push_back(std::make_pair(__S(__i)[__n], __i));
       __gnu_sequential::sort(__sample.begin(), __sample.end(), __lcomp);
 
-      for (int __i = 0; __i < __m; __i++)	//conceptual infinity
-	if (__n >= __ns[__i])	//__sequence too short, conceptual infinity
-	  __sample.push_back(std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
+      for (int __i = 0; __i < __m; __i++)       //conceptual infinity
+        if (__n >= __ns[__i])   //__sequence too short, conceptual infinity
+          __sample.push_back(
+            std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
 
       _DifferenceType localrank = __rank * __m / __N ;
 
       int __j;
-      for (__j = 0; __j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j)
-	__a[__sample[__j].second] += __n + 1;
+      for (__j = 0;
+           __j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j)
+        __a[__sample[__j].second] += __n + 1;
       for (; __j < __m; __j++)
-	__b[__sample[__j].second] -= __n + 1;
+        __b[__sample[__j].second] -= __n + 1;
       
       // Further refinement.
       while (__n > 0)
-	{
-	  __n /= 2;
-
-	  int __lmax_seq = -1;	// to avoid warning
-	  const _ValueType* __lmax = NULL; // impossible to avoid the warning?
-	  for (int __i = 0; __i < __m; __i++)
-	    {
-	      if (__a[__i] > 0)
-		{
-		  if (!__lmax)
-		    {
-		      __lmax = &(__S(__i)[__a[__i] - 1]);
-		      __lmax_seq = __i;
-		    }
-		  else
-		    {
-		      // Max, favor rear sequences.
-		      if (!__comp(__S(__i)[__a[__i] - 1], *__lmax))
-			{
-			  __lmax = &(__S(__i)[__a[__i] - 1]);
-			  __lmax_seq = __i;
-			}
-		    }
-		}
-	    }
-
-	  int __i;
-	  for (__i = 0; __i < __m; __i++)
-	    {
-	      _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
-	      if (__lmax && __middle < __ns[__i] &&
-		  __lcomp(std::make_pair(__S(__i)[__middle], __i),
-			std::make_pair(*__lmax, __lmax_seq)))
-		__a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
-	      else
-		__b[__i] -= __n + 1;
-	    }
-
-	  _DifferenceType __leftsize = 0, __total = 0;
-	  for (int __i = 0; __i < __m; __i++)
-	    {
-	      __leftsize += __a[__i] / (__n + 1);
-	      __total += __l / (__n + 1);
-	    }
-	  
-	  _DifferenceType __skew = static_cast<_DifferenceType>
-	    (static_cast<uint64>(__total) * __rank / __N - __leftsize);
-
-	  if (__skew > 0)
-	    {
-	      // Move to the left, find smallest.
-	      std::priority_queue<std::pair<_ValueType, int>,
-		std::vector<std::pair<_ValueType, int> >,
-		_LexicographicReverse<_ValueType, int, _Compare> >
-		__pq(__lrcomp);
-	      
-	      for (int __i = 0; __i < __m; __i++)
-		if (__b[__i] < __ns[__i])
-		  __pq.push(std::make_pair(__S(__i)[__b[__i]], __i));
-
-	      for (; __skew != 0 && !__pq.empty(); --__skew)
-		{
-		  int source = __pq.top().second;
-		  __pq.pop();
-
-		  __a[source] = std::min(__a[source] + __n + 1, __ns[source]);
-		  __b[source] += __n + 1;
-
-		  if (__b[source] < __ns[source])
-		    __pq.push(std::make_pair(__S(source)[__b[source]], source));
-		}
-	    }
-	  else if (__skew < 0)
-	    {
-	      // Move to the right, find greatest.
-	      std::priority_queue<std::pair<_ValueType, int>,
-		std::vector<std::pair<_ValueType, int> >,
-		_Lexicographic<_ValueType, int, _Compare> > __pq(__lcomp);
-
-	      for (int __i = 0; __i < __m; __i++)
-		if (__a[__i] > 0)
-		  __pq.push(std::make_pair(__S(__i)[__a[__i] - 1], __i));
-
-	      for (; __skew != 0; ++__skew)
-		{
-		  int source = __pq.top().second;
-		  __pq.pop();
-
-		  __a[source] -= __n + 1;
-		  __b[source] -= __n + 1;
-
-		  if (__a[source] > 0)
-		    __pq.push(std::make_pair(__S(source)[__a[source] - 1], source));
-		}
-	    }
-	}
+        {
+          __n /= 2;
+
+          int __lmax_seq = -1;  // to avoid warning
+          const _ValueType* __lmax = NULL; // impossible to avoid the warning?
+          for (int __i = 0; __i < __m; __i++)
+            {
+              if (__a[__i] > 0)
+                {
+                  if (!__lmax)
+                    {
+                      __lmax = &(__S(__i)[__a[__i] - 1]);
+                      __lmax_seq = __i;
+                    }
+                  else
+                    {
+                      // Max, favor rear sequences.
+                      if (!__comp(__S(__i)[__a[__i] - 1], *__lmax))
+                        {
+                          __lmax = &(__S(__i)[__a[__i] - 1]);
+                          __lmax_seq = __i;
+                        }
+                    }
+                }
+            }
+
+          int __i;
+          for (__i = 0; __i < __m; __i++)
+            {
+              _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
+              if (__lmax && __middle < __ns[__i] &&
+                  __lcomp(std::make_pair(__S(__i)[__middle], __i),
+                        std::make_pair(*__lmax, __lmax_seq)))
+                __a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
+              else
+                __b[__i] -= __n + 1;
+            }
+
+          _DifferenceType __leftsize = 0, __total = 0;
+          for (int __i = 0; __i < __m; __i++)
+            {
+              __leftsize += __a[__i] / (__n + 1);
+              __total += __l / (__n + 1);
+            }
+          
+          _DifferenceType __skew = static_cast<_DifferenceType>
+            (static_cast<uint64>(__total) * __rank / __N - __leftsize);
+
+          if (__skew > 0)
+            {
+              // Move to the left, find smallest.
+              std::priority_queue<std::pair<_ValueType, int>,
+                std::vector<std::pair<_ValueType, int> >,
+                _LexicographicReverse<_ValueType, int, _Compare> >
+                __pq(__lrcomp);
+              
+              for (int __i = 0; __i < __m; __i++)
+                if (__b[__i] < __ns[__i])
+                  __pq.push(std::make_pair(__S(__i)[__b[__i]], __i));
+
+              for (; __skew != 0 && !__pq.empty(); --__skew)
+                {
+                  int source = __pq.top().second;
+                  __pq.pop();
+
+                  __a[source] = std::min(__a[source] + __n + 1, __ns[source]);
+                  __b[source] += __n + 1;
+
+                  if (__b[source] < __ns[source])
+                    __pq.push(
+                      std::make_pair(__S(source)[__b[source]], source));
+                }
+            }
+          else if (__skew < 0)
+            {
+              // Move to the right, find greatest.
+              std::priority_queue<std::pair<_ValueType, int>,
+                std::vector<std::pair<_ValueType, int> >,
+                _Lexicographic<_ValueType, int, _Compare> > __pq(__lcomp);
+
+              for (int __i = 0; __i < __m; __i++)
+                if (__a[__i] > 0)
+                  __pq.push(std::make_pair(__S(__i)[__a[__i] - 1], __i));
+
+              for (; __skew != 0; ++__skew)
+                {
+                  int source = __pq.top().second;
+                  __pq.pop();
+
+                  __a[source] -= __n + 1;
+                  __b[source] -= __n + 1;
+
+                  if (__a[source] > 0)
+                    __pq.push(
+                      std::make_pair(__S(source)[__a[source] - 1], source));
+                }
+            }
+        }
 
       // Postconditions:
-      // __a[__i] == __b[__i] in most cases, except when __a[__i] has been clamped
-      // because of having reached the boundary
+      // __a[__i] == __b[__i] in most cases, except when __a[__i] has been
+      // clamped because of having reached the boundary
 
       // Now return the result, calculate the offset.
 
@@ -329,34 +337,34 @@ namespace __gnu_parallel
       _ValueType* __maxleft = NULL;
       _ValueType* __minright = NULL;
       for (int __i = 0; __i < __m; __i++)
-	{
-	  if (__a[__i] > 0)
-	    {
-	      if (!__maxleft)
-		__maxleft = &(__S(__i)[__a[__i] - 1]);
-	      else
-		{
-		  // Max, favor rear sequences.
-		  if (!__comp(__S(__i)[__a[__i] - 1], *__maxleft))
-		    __maxleft = &(__S(__i)[__a[__i] - 1]);
-		}
-	    }
-	  if (__b[__i] < __ns[__i])
-	    {
-	      if (!__minright)
-		__minright = &(__S(__i)[__b[__i]]);
-	      else
-		{
-		  // Min, favor fore sequences.
-		  if (__comp(__S(__i)[__b[__i]], *__minright))
-		    __minright = &(__S(__i)[__b[__i]]);
-		}
-	    }
-	}
+        {
+          if (__a[__i] > 0)
+            {
+              if (!__maxleft)
+                __maxleft = &(__S(__i)[__a[__i] - 1]);
+              else
+                {
+                  // Max, favor rear sequences.
+                  if (!__comp(__S(__i)[__a[__i] - 1], *__maxleft))
+                    __maxleft = &(__S(__i)[__a[__i] - 1]);
+                }
+            }
+          if (__b[__i] < __ns[__i])
+            {
+              if (!__minright)
+                __minright = &(__S(__i)[__b[__i]]);
+              else
+                {
+                  // Min, favor fore sequences.
+                  if (__comp(__S(__i)[__b[__i]], *__minright))
+                    __minright = &(__S(__i)[__b[__i]]);
+                }
+            }
+        }
 
       int __seq = 0;
       for (int __i = 0; __i < __m; __i++)
-	__begin_offsets[__i] = __S(__i) + __a[__i];
+        __begin_offsets[__i] = __S(__i) + __a[__i];
 
       delete[] __ns;
       delete[] __a;
@@ -379,17 +387,18 @@ namespace __gnu_parallel
    *  @param __comp The ordering functor, defaults to std::less. 
    */
   template<typename _Tp, typename _RanSeqs, typename _RankType,
-	   typename _Compare>
+           typename _Compare>
     _Tp
-    multiseq_selection(_RanSeqs __begin_seqs, _RanSeqs __end_seqs, _RankType __rank,
-		       _RankType& __offset, _Compare __comp = std::less<_Tp>())
+    multiseq_selection(_RanSeqs __begin_seqs, _RanSeqs __end_seqs,
+                       _RankType __rank,
+                       _RankType& __offset, _Compare __comp = std::less<_Tp>())
     {
       _GLIBCXX_CALL(__end_seqs - __begin_seqs)
 
       typedef typename std::iterator_traits<_RanSeqs>::value_type::first_type
-	_It;
+        _It;
       typedef typename std::iterator_traits<_It>::difference_type
-	_DifferenceType;
+        _DifferenceType;
 
       _Lexicographic<_Tp, int, _Compare> __lcomp(__comp);
       _LexicographicReverse<_Tp, int, _Compare> __lrcomp(__comp);
@@ -401,13 +410,14 @@ namespace __gnu_parallel
       _DifferenceType __nmax, __n, __r;
 
       for (int __i = 0; __i < __m; __i++)
-	__N += std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second);
+        __N += std::distance(__begin_seqs[__i].first,
+                             __begin_seqs[__i].second);
 
       if (__m == 0 || __N == 0 || __rank < 0 || __rank >= __N)
-	{
-	  // _Result undefined when there is no data or __rank is outside bounds.
-	  throw std::exception();
-	}
+        {
+          // result undefined if there is no data or __rank is outside bounds
+          throw std::exception();
+        }
 
 
       _DifferenceType* __ns = new _DifferenceType[__m];
@@ -418,10 +428,11 @@ namespace __gnu_parallel
       __ns[0] = std::distance(__begin_seqs[0].first, __begin_seqs[0].second);
       __nmax = __ns[0];
       for (int __i = 0; __i < __m; ++__i)
-	{
-	  __ns[__i] = std::distance(__begin_seqs[__i].first, __begin_seqs[__i].second);
-	  __nmax = std::max(__nmax, __ns[__i]);
-	}
+        {
+          __ns[__i] = std::distance(__begin_seqs[__i].first,
+                                    __begin_seqs[__i].second);
+          __nmax = std::max(__nmax, __ns[__i]);
+        }
 
       __r = __log2(__nmax) + 1;
 
@@ -433,10 +444,10 @@ namespace __gnu_parallel
       __N = __l * __m;
 
       for (int __i = 0; __i < __m; ++__i)
-	{
-	  __a[__i] = 0;
-	  __b[__i] = __l;
-	}
+        {
+          __a[__i] = 0;
+          __b[__i] = __l;
+        }
       __n = __l / 2;
 
       // Invariants:
@@ -448,115 +459,120 @@ namespace __gnu_parallel
       std::vector<std::pair<_Tp, int> > __sample;
 
       for (int __i = 0; __i < __m; __i++)
-	if (__n < __ns[__i])
-	  __sample.push_back(std::make_pair(__S(__i)[__n], __i));
+        if (__n < __ns[__i])
+          __sample.push_back(std::make_pair(__S(__i)[__n], __i));
       __gnu_sequential::sort(__sample.begin(), __sample.end(),
-			     __lcomp, sequential_tag());
+                             __lcomp, sequential_tag());
 
       // Conceptual infinity.
       for (int __i = 0; __i < __m; __i++)
-	if (__n >= __ns[__i])
-	  __sample.push_back(std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
+        if (__n >= __ns[__i])
+          __sample.push_back(
+            std::make_pair(__S(__i)[0] /*__dummy element*/, __i));
 
       _DifferenceType localrank = __rank * __m / __N ;
 
       int __j;
-      for (__j = 0; __j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j)
-	__a[__sample[__j].second] += __n + 1;
+      for (__j = 0;
+           __j < localrank && ((__n + 1) <= __ns[__sample[__j].second]); ++__j)
+        __a[__sample[__j].second] += __n + 1;
       for (; __j < __m; ++__j)
-	__b[__sample[__j].second] -= __n + 1;
+        __b[__sample[__j].second] -= __n + 1;
 
       // Further refinement.
       while (__n > 0)
-	{
-	  __n /= 2;
-
-	  const _Tp* __lmax = NULL;
-	  for (int __i = 0; __i < __m; ++__i)
-	    {
-	      if (__a[__i] > 0)
-		{
-		  if (!__lmax)
-		    __lmax = &(__S(__i)[__a[__i] - 1]);
-		  else
-		    {
-		      if (__comp(*__lmax, __S(__i)[__a[__i] - 1]))	//max
-			__lmax = &(__S(__i)[__a[__i] - 1]);
-		    }
-		}
-	    }
-
-	  int __i;
-	  for (__i = 0; __i < __m; __i++)
-	    {
-	      _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
-	      if (__lmax && __middle < __ns[__i] && __comp(__S(__i)[__middle], *__lmax))
-		__a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
-	      else
-		__b[__i] -= __n + 1;
-	    }
-
-	  _DifferenceType __leftsize = 0, __total = 0;
-	  for (int __i = 0; __i < __m; ++__i)
-	    {
-	      __leftsize += __a[__i] / (__n + 1);
-	      __total += __l / (__n + 1);
-	    }
-
-	  _DifferenceType __skew = ((unsigned long long)__total * __rank / __N
-				  - __leftsize);
-
-	  if (__skew > 0)
-	    {
-	      // Move to the left, find smallest.
-	      std::priority_queue<std::pair<_Tp, int>,
-		std::vector<std::pair<_Tp, int> >,
-		_LexicographicReverse<_Tp, int, _Compare> > __pq(__lrcomp);
-
-	      for (int __i = 0; __i < __m; ++__i)
-		if (__b[__i] < __ns[__i])
-		  __pq.push(std::make_pair(__S(__i)[__b[__i]], __i));
-
-	      for (; __skew != 0 && !__pq.empty(); --__skew)
-		{
-		  int source = __pq.top().second;
-		  __pq.pop();
-		  
-		  __a[source] = std::min(__a[source] + __n + 1, __ns[source]);
-		  __b[source] += __n + 1;
-		  
-		  if (__b[source] < __ns[source])
-		    __pq.push(std::make_pair(__S(source)[__b[source]], source));
-		}
-	    }
-	  else if (__skew < 0)
-	    {
-	      // Move to the right, find greatest.
-	      std::priority_queue<std::pair<_Tp, int>,
-		std::vector<std::pair<_Tp, int> >,
-		_Lexicographic<_Tp, int, _Compare> > __pq(__lcomp);
-
-	      for (int __i = 0; __i < __m; ++__i)
-		if (__a[__i] > 0)
-		  __pq.push(std::make_pair(__S(__i)[__a[__i] - 1], __i));
-
-	      for (; __skew != 0; ++__skew)
-		{
-		  int source = __pq.top().second;
-		  __pq.pop();
-
-		  __a[source] -= __n + 1;
-		  __b[source] -= __n + 1;
-
-		  if (__a[source] > 0)
-		    __pq.push(std::make_pair(__S(source)[__a[source] - 1], source));
-		}
-	    }
-	}
+        {
+          __n /= 2;
+
+          const _Tp* __lmax = NULL;
+          for (int __i = 0; __i < __m; ++__i)
+            {
+              if (__a[__i] > 0)
+                {
+                  if (!__lmax)
+                    __lmax = &(__S(__i)[__a[__i] - 1]);
+                  else
+                    {
+                      if (__comp(*__lmax, __S(__i)[__a[__i] - 1]))      //max
+                        __lmax = &(__S(__i)[__a[__i] - 1]);
+                    }
+                }
+            }
+
+          int __i;
+          for (__i = 0; __i < __m; __i++)
+            {
+              _DifferenceType __middle = (__b[__i] + __a[__i]) / 2;
+              if (__lmax && __middle < __ns[__i]
+                  && __comp(__S(__i)[__middle], *__lmax))
+                __a[__i] = std::min(__a[__i] + __n + 1, __ns[__i]);
+              else
+                __b[__i] -= __n + 1;
+            }
+
+          _DifferenceType __leftsize = 0, __total = 0;
+          for (int __i = 0; __i < __m; ++__i)
+            {
+              __leftsize += __a[__i] / (__n + 1);
+              __total += __l / (__n + 1);
+            }
+
+          _DifferenceType __skew = ((unsigned long long)__total * __rank / __N
+                                  - __leftsize);
+
+          if (__skew > 0)
+            {
+              // Move to the left, find smallest.
+              std::priority_queue<std::pair<_Tp, int>,
+                std::vector<std::pair<_Tp, int> >,
+                _LexicographicReverse<_Tp, int, _Compare> > __pq(__lrcomp);
+
+              for (int __i = 0; __i < __m; ++__i)
+                if (__b[__i] < __ns[__i])
+                  __pq.push(std::make_pair(__S(__i)[__b[__i]], __i));
+
+              for (; __skew != 0 && !__pq.empty(); --__skew)
+                {
+                  int source = __pq.top().second;
+                  __pq.pop();
+
+                  __a[source] = std::min(__a[source] + __n + 1, __ns[source]);
+                  __b[source] += __n + 1;
+
+                  if (__b[source] < __ns[source])
+                    __pq.push(
+                      std::make_pair(__S(source)[__b[source]], source));
+                }
+            }
+          else if (__skew < 0)
+            {
+              // Move to the right, find greatest.
+              std::priority_queue<std::pair<_Tp, int>,
+                std::vector<std::pair<_Tp, int> >,
+                _Lexicographic<_Tp, int, _Compare> > __pq(__lcomp);
+
+              for (int __i = 0; __i < __m; ++__i)
+                if (__a[__i] > 0)
+                  __pq.push(std::make_pair(__S(__i)[__a[__i] - 1], __i));
+
+              for (; __skew != 0; ++__skew)
+                {
+                  int source = __pq.top().second;
+                  __pq.pop();
+
+                  __a[source] -= __n + 1;
+                  __b[source] -= __n + 1;
+
+                  if (__a[source] > 0)
+                    __pq.push(
+                      std::make_pair(__S(source)[__a[source] - 1], source));
+                }
+            }
+        }
 
       // Postconditions:
-      // __a[__i] == __b[__i] in most cases, except when __a[__i] has been clamped
-      // because of having reached the boundary
+      // __a[__i] == __b[__i] in most cases, except when __a[__i] has been
+      // clamped because of having reached the boundary
 
       // Now return the result, calculate the offset.
 
@@ -568,57 +584,58 @@ namespace __gnu_parallel
       // Impossible to avoid the warning?
       _Tp __maxleft, __minright;
       for (int __i = 0; __i < __m; ++__i)
-	{
-	  if (__a[__i] > 0)
-	    {
-	      if (!__maxleftset)
-		{
-		  __maxleft = __S(__i)[__a[__i] - 1];
-		  __maxleftset = true;
-		}
-	      else
-		{
-		  // Max.
-		  if (__comp(__maxleft, __S(__i)[__a[__i] - 1]))
-		    __maxleft = __S(__i)[__a[__i] - 1];
-		}
-	    }
-	  if (__b[__i] < __ns[__i])
-	    {
-	      if (!__minrightset)
-		{
-		  __minright = __S(__i)[__b[__i]];
-		  __minrightset = true;
-		}
-	      else
-		{
-		  // Min.
-		  if (__comp(__S(__i)[__b[__i]], __minright))
-		    __minright = __S(__i)[__b[__i]];
-		}
-	    }
+        {
+          if (__a[__i] > 0)
+            {
+              if (!__maxleftset)
+                {
+                  __maxleft = __S(__i)[__a[__i] - 1];
+                  __maxleftset = true;
+                }
+              else
+                {
+                  // Max.
+                  if (__comp(__maxleft, __S(__i)[__a[__i] - 1]))
+                    __maxleft = __S(__i)[__a[__i] - 1];
+                }
+            }
+          if (__b[__i] < __ns[__i])
+            {
+              if (!__minrightset)
+                {
+                  __minright = __S(__i)[__b[__i]];
+                  __minrightset = true;
+                }
+              else
+                {
+                  // Min.
+                  if (__comp(__S(__i)[__b[__i]], __minright))
+                    __minright = __S(__i)[__b[__i]];
+                }
+            }
       }
 
       // Minright is the splitter, in any case.
 
       if (!__maxleftset || __comp(__minright, __maxleft))
-	{
-	  // Good luck, everything is split unambiguously.
-	  __offset = 0;
-	}
+        {
+          // Good luck, everything is split unambiguously.
+          __offset = 0;
+        }
       else
-	{
-	  // We have to calculate an offset.
-	  __offset = 0;
-
-	  for (int __i = 0; __i < __m; ++__i)
-	    {
-	      _DifferenceType lb = std::lower_bound(__S(__i), __S(__i) + __ns[__i],
-						    __minright,
-						    __comp) - __S(__i);
-	      __offset += __a[__i] - lb;
-	    }
-	}
+        {
+          // We have to calculate an offset.
+          __offset = 0;
+
+          for (int __i = 0; __i < __m; ++__i)
+            {
+              _DifferenceType lb
+                = std::lower_bound(__S(__i), __S(__i) + __ns[__i],
+                                   __minright,
+                                   __comp) - __S(__i);
+              __offset += __a[__i] - lb;
+            }
+        }
 
       delete[] __ns;
       delete[] __a;
diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h
index 808caf20999..b5540e71426 100644
--- a/libstdc++-v3/include/parallel/multiway_merge.h
+++ b/libstdc++-v3/include/parallel/multiway_merge.h
@@ -144,11 +144,11 @@ template<typename _RAIter, typename _Compare>
   operator<(_GuardedIterator<_RAIter, _Compare>& __bi1,
             _GuardedIterator<_RAIter, _Compare>& __bi2)
   {
-    if (__bi1._M_current == __bi1._M_end)	//__bi1 is sup
-      return __bi2._M_current == __bi2._M_end;	//__bi2 is not sup
-    if (__bi2._M_current == __bi2._M_end)	//__bi2 is sup
+    if (__bi1._M_current == __bi1._M_end)       //__bi1 is sup
+      return __bi2._M_current == __bi2._M_end;  //__bi2 is not sup
+    if (__bi2._M_current == __bi2._M_end)       //__bi2 is sup
       return true;
-    return (__bi1.__comp)(*__bi1, *__bi2);	//normal compare
+    return (__bi1.__comp)(*__bi1, *__bi2);      //normal compare
   }
 
 /** @brief Compare two elements referenced by guarded iterators.
@@ -160,11 +160,11 @@ template<typename _RAIter, typename _Compare>
   operator<=(_GuardedIterator<_RAIter, _Compare>& __bi1,
                _GuardedIterator<_RAIter, _Compare>& __bi2)
   {
-    if (__bi2._M_current == __bi2._M_end)	//__bi1 is sup
-      return __bi1._M_current != __bi1._M_end;	//__bi2 is not sup
-    if (__bi1._M_current == __bi1._M_end)	//__bi2 is sup
+    if (__bi2._M_current == __bi2._M_end)       //__bi1 is sup
+      return __bi1._M_current != __bi1._M_end;  //__bi2 is not sup
+    if (__bi1._M_current == __bi1._M_end)       //__bi2 is sup
       return false;
-    return !(__bi1.__comp)(*__bi2, *__bi1);	//normal compare
+    return !(__bi1.__comp)(*__bi2, *__bi1);     //normal compare
   }
 
 template<typename _RAIter, typename _Compare>
@@ -282,10 +282,10 @@ template<typename _RAIter, typename _Compare>
  * @return End iterator of output sequence.
  */
 template<template<typename RAI, typename C> class iterator,
-	 typename _RAIterIterator,
-	 typename _RAIter3,
-	 typename _DifferenceTp,
-	 typename _Compare>
+         typename _RAIterIterator,
+         typename _RAIter3,
+         typename _DifferenceTp,
+         typename _Compare>
   _RAIter3
   multiway_merge_3_variant(
       _RAIterIterator __seqs_begin,
@@ -402,10 +402,10 @@ template<template<typename RAI, typename C> class iterator,
  * @return End iterator of output sequence.
  */
 template<template<typename RAI, typename C> class iterator,
-	 typename _RAIterIterator,
-	 typename _RAIter3,
-	 typename _DifferenceTp,
-	 typename _Compare>
+         typename _RAIterIterator,
+         typename _RAIter3,
+         typename _DifferenceTp,
+         typename _Compare>
   _RAIter3
   multiway_merge_4_variant(_RAIterIterator __seqs_begin,
                            _RAIterIterator __seqs_end,
@@ -427,10 +427,10 @@ template<template<typename RAI, typename C> class iterator,
       __seq2(__seqs_begin[2].first, __seqs_begin[2].second, __comp),
       __seq3(__seqs_begin[3].first, __seqs_begin[3].second, __comp);
 
-#define _GLIBCXX_PARALLEL_DECISION(__a,__b,__c,d) {                   \
-      if (__seq ## d < __seq ## __a) goto __s ## d ## __a ## __b ## __c;	\
-      if (__seq ## d < __seq ## __b) goto __s ## __a ## d ## __b ## __c;	\
-      if (__seq ## d < __seq ## __c) goto __s ## __a ## __b ## d ## __c;	\
+#define _GLIBCXX_PARALLEL_DECISION(__a,__b,__c,d) {                      \
+      if (__seq ## d < __seq ## __a) goto __s ## d ## __a ## __b ## __c; \
+      if (__seq ## d < __seq ## __b) goto __s ## __a ## d ## __b ## __c; \
+      if (__seq ## d < __seq ## __c) goto __s ## __a ## __b ## d ## __c; \
       goto __s ## __a ## __b ## __c ## d;  }
 
     if (__seq0 <= __seq1)
@@ -456,16 +456,16 @@ template<template<typename RAI, typename C> class iterator,
           _GLIBCXX_PARALLEL_DECISION(2,1,0,3)
             }
 
-#define _GLIBCXX_PARALLEL_MERGE_4_CASE(__a,__b,__c,d,c0,c1,c2)        \
-    __s ## __a ## __b ## __c ## d:                                      \
-      if (__length == 0) goto finish;                             \
-    *__target = *__seq ## __a;                                        \
-    ++__target;                                                   \
-    --__length;                                                   \
-    ++__seq ## __a;                                                 \
-    if (__seq ## __a c0 __seq ## __b) goto __s ## __a ## __b ## __c ## d;       \
-    if (__seq ## __a c1 __seq ## __c) goto __s ## __b ## __a ## __c ## d;       \
-    if (__seq ## __a c2 __seq ## d) goto __s ## __b ## __c ## __a ## d;       \
+#define _GLIBCXX_PARALLEL_MERGE_4_CASE(__a,__b,__c,d,c0,c1,c2)            \
+    __s ## __a ## __b ## __c ## d:                                        \
+      if (__length == 0) goto finish;                                     \
+    *__target = *__seq ## __a;                                            \
+    ++__target;                                                           \
+    --__length;                                                           \
+    ++__seq ## __a;                                                       \
+    if (__seq ## __a c0 __seq ## __b) goto __s ## __a ## __b ## __c ## d; \
+    if (__seq ## __a c1 __seq ## __c) goto __s ## __b ## __a ## __c ## d; \
+    if (__seq ## __a c2 __seq ## d) goto __s ## __b ## __c ## __a ## d;   \
     goto __s ## __b ## __c ## d ## __a;
 
     _GLIBCXX_PARALLEL_MERGE_4_CASE(0, 1, 2, 3, <=, <=, <=);
@@ -526,10 +526,10 @@ template<template<typename RAI, typename C> class iterator,
  * @return End iterator of output sequence.
  */
 template<typename LT,
-	 typename _RAIterIterator,
-	 typename _RAIter3,
-	 typename _DifferenceTp,
-	 typename _Compare>
+         typename _RAIterIterator,
+         typename _RAIter3,
+         typename _DifferenceTp,
+         typename _Compare>
   _RAIter3
   multiway_merge_loser_tree(_RAIterIterator __seqs_begin,
                             _RAIterIterator __seqs_end,
@@ -638,7 +638,8 @@ template<typename LT,
     for (int __t = 0; __t < __k; ++__t)
       {
 #if _GLIBCXX_ASSERTIONS
-        _GLIBCXX_PARALLEL_ASSERT(__seqs_begin[__t].first != __seqs_begin[__t].second);
+        _GLIBCXX_PARALLEL_ASSERT(__seqs_begin[__t].first
+                                 != __seqs_begin[__t].second);
 #endif
         __lt.__insert_start(*__seqs_begin[__t].first, __t, false);
       }
@@ -914,7 +915,8 @@ struct __multiway_merge_k_variant_sentinel_switch
             _LoserTreeTraits<_ValueType>::_M_use_pointer
           , LoserTreePointerUnguarded<__stable, _ValueType, _Compare>
           , _LoserTreeUnguarded<__stable, _ValueType, _Compare>
-        >::__type>(__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
+        >::__type>(
+            __seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
   }
 };
 
@@ -997,7 +999,8 @@ template<
 #if _GLIBCXX_ASSERTIONS
     for (_RAIterIterator __s = __seqs_begin; __s != __seqs_end; ++__s)
       {
-        _GLIBCXX_PARALLEL_ASSERT(__is_sorted((*__s).first, (*__s).second, __comp));
+        _GLIBCXX_PARALLEL_ASSERT(
+          __is_sorted((*__s).first, (*__s).second, __comp));
       }
 #endif
 
@@ -1053,11 +1056,13 @@ template<
             , _RAIterIterator
             , _RAIter3
             , _DifferenceTp
-            , _Compare>()(__seqs_begin, __seqs_end, __target, __sentinel, __length, __comp);
+            , _Compare>()(__seqs_begin, __seqs_end, __target, __sentinel,
+                          __length, __comp);
           break;
       }
 #if _GLIBCXX_ASSERTIONS
-    _GLIBCXX_PARALLEL_ASSERT(__is_sorted(__target, __target + __length, __comp));
+    _GLIBCXX_PARALLEL_ASSERT(
+      __is_sorted(__target, __target + __length, __comp));
 #endif
 
     return __return_target;
@@ -1163,7 +1168,8 @@ void multiway_merge_sampling_splitting(
               - __seqs_begin[__seq].first;
         else
             // Absolute end.
-          __pieces[__slab][__seq].second = _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]);
+          __pieces[__slab][__seq].second
+            = _GLIBCXX_PARALLEL_LENGTH(__seqs_begin[__seq]);
       }
     ::operator delete(__samples);
 }
@@ -1379,7 +1385,8 @@ template<
         } // parallel
 
 #if _GLIBCXX_ASSERTIONS
-      _GLIBCXX_PARALLEL_ASSERT(__is_sorted(__target, __target + __length, __comp));
+      _GLIBCXX_PARALLEL_ASSERT(
+        __is_sorted(__target, __target + __length, __comp));
 #endif
 
       __k = 0;
@@ -1490,7 +1497,8 @@ multiway_merge(_RAIterPairIterator __seqs_begin
   // Execute multiway merge *sequentially*.
   return __sequential_multiway_merge
     </* __stable = */ false, /* __sentinels = */ false>
-      (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp);
+      (__seqs_begin, __seqs_end, __target,
+      *(__seqs_begin->second), __length, __comp);
 }
 
 // public interface
@@ -1528,11 +1536,13 @@ multiway_merge(_RAIterPairIterator __seqs_begin
           multiway_merge_exact_splitting</* __stable = */ false,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
                       </* __stable = */ false, /* __sentinels = */ false>(
-          __seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp);
+               __seqs_begin, __seqs_end, __target, *(__seqs_begin->second),
+               __length, __comp);
 }
 
 // public interface
@@ -1571,7 +1581,8 @@ multiway_merge(_RAIterPairIterator __seqs_begin
           multiway_merge_exact_splitting</* __stable = */ false,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
                       </* __stable = */ false, /* __sentinels = */ false>(
@@ -1637,7 +1648,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
     // Execute multiway merge *sequentially*.
     return __sequential_multiway_merge
       </* __stable = */ true, /* __sentinels = */ false>
-        (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp);
+        (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length,
+         __comp);
 }
 
 // public interface
@@ -1676,7 +1688,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
           multiway_merge_exact_splitting</* __stable = */ true,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge</* __stable = */ true,
         /* __sentinels = */ false>(
@@ -1720,7 +1733,8 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
           multiway_merge_sampling_splitting</* __stable = */ true,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
         </* __stable = */ true, /* __sentinels = */ false>(
@@ -1742,8 +1756,9 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
     , _DifferenceTp __length, _Compare __comp
     , parallel_tag __tag = parallel_tag(0))
 {
-  return stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length, __comp,
-                         exact_tag(__tag.__get_num_threads()));
+  return stable_multiway_merge(
+           __seqs_begin, __seqs_end, __target, __length, __comp,
+           exact_tag(__tag.__get_num_threads()));
 }
 
 // public interface
@@ -1759,8 +1774,9 @@ stable_multiway_merge(_RAIterPairIterator __seqs_begin
     , _DifferenceTp __length, _Compare __comp
     , default_parallel_tag __tag)
 {
-  return stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length, __comp,
-                         exact_tag(__tag.__get_num_threads()));
+  return stable_multiway_merge(
+           __seqs_begin, __seqs_end, __target, __length, __comp,
+           exact_tag(__tag.__get_num_threads()));
 }
 
 /**
@@ -1902,7 +1918,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
           multiway_merge_exact_splitting</* __stable = */ false,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
         </* __stable = */ false, /* __sentinels = */ true>(
@@ -1945,7 +1962,8 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
           multiway_merge_sampling_splitting</* __stable = */ false,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
         </* __stable = */false, /* __sentinels = */ true>(
@@ -1966,8 +1984,9 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
     , _DifferenceTp __length, _Compare __comp
     , parallel_tag __tag = parallel_tag(0))
 {
-  return multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp,
-                         exact_tag(__tag.__get_num_threads()));
+  return multiway_merge_sentinels(
+           __seqs_begin, __seqs_end, __target, __length, __comp,
+           exact_tag(__tag.__get_num_threads()));
 }
 
 // public interface
@@ -1983,8 +2002,9 @@ multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
     , _DifferenceTp __length, _Compare __comp
     , default_parallel_tag __tag)
 {
-  return multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp,
-                         exact_tag(__tag.__get_num_threads()));
+  return multiway_merge_sentinels(
+           __seqs_begin, __seqs_end, __target, __length, __comp,
+           exact_tag(__tag.__get_num_threads()));
 }
 
 // stable_multiway_merge_sentinels
@@ -2011,7 +2031,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
     // Execute multiway merge *sequentially*.
     return __sequential_multiway_merge
       </* __stable = */ true, /* __sentinels = */ true>
-        (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp);
+        (__seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length,
+         __comp);
 }
 
 // public interface
@@ -2050,11 +2071,13 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
           multiway_merge_exact_splitting</* __stable = */ true,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+          __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
         </* __stable = */ true, /* __sentinels = */ true>(
-          __seqs_begin, __seqs_end, __target, *(__seqs_begin->second), __length, __comp);
+          __seqs_begin, __seqs_end, __target, *(__seqs_begin->second),
+          __length, __comp);
 }
 
 // public interface
@@ -2093,7 +2116,8 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
           multiway_merge_sampling_splitting</* __stable = */ true,
             typename std::iterator_traits<_RAIterPairIterator>
               ::value_type*, _Compare, _DifferenceTp>,
-          static_cast<_DifferenceType>(__length), __comp, __tag.__get_num_threads());
+          static_cast<_DifferenceType>(__length), __comp,
+                                       __tag.__get_num_threads());
     else
       return __sequential_multiway_merge
         </* __stable = */ true, /* __sentinels = */ true>(
@@ -2114,8 +2138,9 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
     , _DifferenceTp __length, _Compare __comp
     , parallel_tag __tag = parallel_tag(0))
 {
-  return stable_multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp,
-                         exact_tag(__tag.__get_num_threads()));
+  return stable_multiway_merge_sentinels(
+           __seqs_begin, __seqs_end, __target, __length, __comp,
+           exact_tag(__tag.__get_num_threads()));
 }
 
 // public interface
@@ -2131,8 +2156,9 @@ stable_multiway_merge_sentinels(_RAIterPairIterator __seqs_begin
     , _DifferenceTp __length, _Compare __comp
     , default_parallel_tag __tag)
 {
-  return stable_multiway_merge_sentinels(__seqs_begin, __seqs_end, __target, __length, __comp,
-                         exact_tag(__tag.__get_num_threads()));
+  return stable_multiway_merge_sentinels(
+           __seqs_begin, __seqs_end, __target, __length, __comp,
+           exact_tag(__tag.__get_num_threads()));
 }
 
 }; // namespace __gnu_parallel
diff --git a/libstdc++-v3/include/parallel/multiway_mergesort.h b/libstdc++-v3/include/parallel/multiway_mergesort.h
index 546b476da8f..9f61ce305a2 100644
--- a/libstdc++-v3/include/parallel/multiway_mergesort.h
+++ b/libstdc++-v3/include/parallel/multiway_mergesort.h
@@ -111,7 +111,7 @@ template<typename _RAIter, typename _DifferenceTp>
 
     for (_DifferenceType __i = 0; __i < __num_samples; ++__i)
       ::new(&(__sd->_M_samples[__iam * __num_samples + __i]))
-	  _ValueType(__sd->_M_source[__sd->_M_starts[__iam] + __es[__i + 1]]);
+          _ValueType(__sd->_M_source[__sd->_M_starts[__iam] + __es[__i + 1]]);
 
     delete[] __es;
   }
@@ -144,25 +144,28 @@ template<typename _RAIter, typename _Compare,
         seqs(__sd->_M_num_threads);
     for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++)
       seqs[__s] = std::make_pair(__sd->_M_temporary[__s],
-                                __sd->_M_temporary[__s]
-                                    + (__sd->_M_starts[__s + 1] - __sd->_M_starts[__s]));
+                                 __sd->_M_temporary[__s]
+                                 + (__sd->_M_starts[__s + 1]
+                                 - __sd->_M_starts[__s]));
 
     std::vector<_SortingPlacesIterator> _M_offsets(__sd->_M_num_threads);
 
     // if not last thread
     if (__iam < __sd->_M_num_threads - 1)
       multiseq_partition(seqs.begin(), seqs.end(),
-                          __sd->_M_starts[__iam + 1], _M_offsets.begin(), __comp);
+                         __sd->_M_starts[__iam + 1], _M_offsets.begin(),
+                         __comp);
 
     for (int __seq = 0; __seq < __sd->_M_num_threads; __seq++)
       {
         // for each sequence
         if (__iam < (__sd->_M_num_threads - 1))
-          __sd->_M_pieces[__iam][__seq]._M_end = _M_offsets[__seq] - seqs[__seq].first;
+          __sd->_M_pieces[__iam][__seq]._M_end
+            = _M_offsets[__seq] - seqs[__seq].first;
         else
           // very end of this sequence
           __sd->_M_pieces[__iam][__seq]._M_end =
-              __sd->_M_starts[__seq + 1] - __sd->_M_starts[__seq];
+            __sd->_M_starts[__seq + 1] - __sd->_M_starts[__seq];
       }
 
 #   pragma omp barrier
@@ -171,7 +174,8 @@ template<typename _RAIter, typename _Compare,
       {
         // For each sequence.
         if (__iam > 0)
-          __sd->_M_pieces[__iam][__seq]._M_begin = __sd->_M_pieces[__iam - 1][__seq]._M_end;
+          __sd->_M_pieces[__iam][__seq]._M_begin =
+            __sd->_M_pieces[__iam - 1][__seq]._M_end;
         else
           // Absolute beginning.
           __sd->_M_pieces[__iam][__seq]._M_begin = 0;
@@ -204,7 +208,8 @@ template<typename _RAIter, typename _Compare,
 
 #     pragma omp single
       __gnu_sequential::sort(__sd->_M_samples,
-                             __sd->_M_samples + (__num_samples * __sd->_M_num_threads),
+                             __sd->_M_samples
+                                + (__num_samples * __sd->_M_num_threads),
                              __comp);
 
 #     pragma omp barrier
@@ -224,17 +229,19 @@ template<typename _RAIter, typename _Compare,
             // Absolute beginning.
             __sd->_M_pieces[__iam][__s]._M_begin = 0;
 
-          if ((__num_samples * (__iam + 1)) < (__num_samples * __sd->_M_num_threads))
+          if ((__num_samples * (__iam + 1)) <
+                         (__num_samples * __sd->_M_num_threads))
             __sd->_M_pieces[__iam][__s]._M_end =
                 std::lower_bound(__sd->_M_temporary[__s],
                         __sd->_M_temporary[__s]
-                            + (__sd->_M_starts[__s + 1] - __sd->_M_starts[__s]),
+                          + (__sd->_M_starts[__s + 1] - __sd->_M_starts[__s]),
                         __sd->_M_samples[__num_samples * (__iam + 1)],
                         __comp)
                 - __sd->_M_temporary[__s];
           else
             // Absolute end.
-            __sd->_M_pieces[__iam][__s]._M_end = __sd->_M_starts[__s + 1] - __sd->_M_starts[__s];
+            __sd->_M_pieces[__iam][__s]._M_end = __sd->_M_starts[__s + 1]
+                                                 - __sd->_M_starts[__s];
         }
     }
   };
@@ -283,8 +290,8 @@ template<typename Seq_RAIter, typename _RAIter,
                       _Compare& __comp,
                       DiffType __length_am) const
     {
-      stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length_am, __comp,
-                       sequential_tag());
+      stable_multiway_merge(__seqs_begin, __seqs_end, __target, __length_am,
+                            __comp, sequential_tag());
     }
   };
 
@@ -322,7 +329,8 @@ template<bool __stable, bool __exact, typename _RAIter,
     _ThreadIndex __iam = omp_get_thread_num();
 
     // Length of this thread's chunk, before merging.
-    _DifferenceType __length_local = __sd->_M_starts[__iam + 1] - __sd->_M_starts[__iam];
+    _DifferenceType __length_local
+                        = __sd->_M_starts[__iam + 1] - __sd->_M_starts[__iam];
 
     // Sort in temporary storage, leave space for sentinel.
 
@@ -333,12 +341,15 @@ template<bool __stable, bool __exact, typename _RAIter,
         ::operator new(sizeof(_ValueType) * (__length_local + 1)));
 
     // Copy there.
-    std::uninitialized_copy(__sd->_M_source + __sd->_M_starts[__iam],
-                            __sd->_M_source + __sd->_M_starts[__iam] + __length_local,
-                            __sd->_M_temporary[__iam]);
+    std::uninitialized_copy(
+                __sd->_M_source + __sd->_M_starts[__iam],
+                __sd->_M_source + __sd->_M_starts[__iam] + __length_local,
+                __sd->_M_temporary[__iam]);
 
     __possibly_stable_sort<__stable, _SortingPlacesIterator, _Compare>()
-        (__sd->_M_temporary[__iam], __sd->_M_temporary[__iam] + __length_local, __comp);
+        (__sd->_M_temporary[__iam],
+         __sd->_M_temporary[__iam] + __length_local,
+         __comp);
 
     // Invariant: locally sorted subsequence in sd->_M_temporary[__iam],
     // __sd->_M_temporary[__iam] + __length_local.
@@ -355,7 +366,8 @@ template<bool __stable, bool __exact, typename _RAIter,
     _DifferenceType __offset = 0, __length_am = 0;
     for (_ThreadIndex __s = 0; __s < __sd->_M_num_threads; __s++)
       {
-        __length_am += __sd->_M_pieces[__iam][__s]._M_end - __sd->_M_pieces[__iam][__s]._M_begin;
+        __length_am += __sd->_M_pieces[__iam][__s]._M_end
+                       - __sd->_M_pieces[__iam][__s]._M_begin;
         __offset += __sd->_M_pieces[__iam][__s]._M_begin;
       }
 
@@ -367,8 +379,9 @@ template<bool __stable, bool __exact, typename _RAIter,
     for (int __s = 0; __s < __sd->_M_num_threads; ++__s)
       {
         seqs[__s] =
-          std::make_pair(__sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_begin,
-        __sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_end);
+          std::make_pair(
+            __sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_begin,
+            __sd->_M_temporary[__s] + __sd->_M_pieces[__iam][__s]._M_end);
       }
 
     __possibly_stable_multiway_merge<
@@ -420,7 +433,7 @@ template<bool __stable, bool __exact, typename _RAIter,
 
 #   pragma omp parallel num_threads(__num_threads)
       {
-        __num_threads = omp_get_num_threads();  //no more threads than requested
+        __num_threads = omp_get_num_threads(); //no more threads than requested
 
 #       pragma omp single
           {
@@ -432,7 +445,7 @@ template<bool __stable, bool __exact, typename _RAIter,
             if (!__exact)
               {
                 _DifferenceType size =
-                    (_Settings::get().sort_mwms_oversampling * __num_threads - 1)
+                  (_Settings::get().sort_mwms_oversampling * __num_threads - 1)
                         * __num_threads;
                 __sd._M_samples = static_cast<_ValueType*>(
                               ::operator new(size * sizeof(_ValueType)));
@@ -441,10 +454,12 @@ template<bool __stable, bool __exact, typename _RAIter,
               __sd._M_samples = NULL;
 
             __sd._M_offsets = new _DifferenceType[__num_threads - 1];
-            __sd._M_pieces = new std::vector<_Piece<_DifferenceType> >[__num_threads];
+            __sd._M_pieces
+                = new std::vector<_Piece<_DifferenceType> >[__num_threads];
             for (int __s = 0; __s < __num_threads; ++__s)
               __sd._M_pieces[__s].resize(__num_threads);
-            _M_starts = __sd._M_starts = new _DifferenceType[__num_threads + 1];
+            _M_starts = __sd._M_starts
+                = new _DifferenceType[__num_threads + 1];
 
             _DifferenceType __chunk_length = __n / __num_threads;
             _DifferenceType __split = __n % __num_threads;
@@ -452,7 +467,8 @@ template<bool __stable, bool __exact, typename _RAIter,
             for (int __i = 0; __i < __num_threads; ++__i)
               {
                 _M_starts[__i] = __pos;
-                __pos += (__i < __split) ? (__chunk_length + 1) : __chunk_length;
+                __pos += (__i < __split)
+                         ? (__chunk_length + 1) : __chunk_length;
               }
             _M_starts[__num_threads] = __pos;
           } //single
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric
index e355097edd6..5d03e679c27 100644
--- a/libstdc++-v3/include/parallel/numeric
+++ b/libstdc++-v3/include/parallel/numeric
@@ -54,76 +54,77 @@ namespace __parallel
   template<typename _IIter, typename _Tp>
     inline _Tp
     accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-	       __gnu_parallel::sequential_tag)
+               __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::accumulate(__begin, __end, __init); }
 
   template<typename _IIter, typename _Tp, typename _BinaryOperation>
     inline _Tp
     accumulate(_IIter __begin, _IIter __end, _Tp __init,
-	       _BinaryOperation __binary_op, __gnu_parallel::sequential_tag)
+               _BinaryOperation __binary_op, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::accumulate(__begin, __end, __init, __binary_op); }
 
   // Sequential fallback for input iterator case.
   template<typename _IIter, typename _Tp, typename _IteratorTag>
     inline _Tp
     __accumulate_switch(_IIter __begin, _IIter __end,
-		      _Tp __init, _IteratorTag) 
-    { return accumulate(__begin, __end, __init, __gnu_parallel::sequential_tag()); }
+                      _Tp __init, _IteratorTag) 
+    { return accumulate(__begin, __end, __init,
+__gnu_parallel::sequential_tag()); }
 
   template<typename _IIter, typename _Tp, typename _BinaryOperation,
-	   typename _IteratorTag>
+           typename _IteratorTag>
     inline _Tp
     __accumulate_switch(_IIter __begin, _IIter __end, _Tp __init, 
-		      _BinaryOperation __binary_op, _IteratorTag)
+                      _BinaryOperation __binary_op, _IteratorTag)
     { return accumulate(__begin, __end, __init, __binary_op, 
-			__gnu_parallel::sequential_tag()); }
+                        __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators.
   template<typename __RAIter, typename _Tp,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     _Tp
     __accumulate_switch(__RAIter __begin, __RAIter __end, 
-		      _Tp __init, _BinaryOperation __binary_op, 
-		      random_access_iterator_tag, 
-		      __gnu_parallel::_Parallelism __parallelism_tag  
-		      = __gnu_parallel::parallel_unbalanced)
+                      _Tp __init, _BinaryOperation __binary_op, 
+                      random_access_iterator_tag, 
+                      __gnu_parallel::_Parallelism __parallelism_tag  
+                      = __gnu_parallel::parallel_unbalanced)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(
-	    static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-	    >= __gnu_parallel::_Settings::get().accumulate_minimal_n
-	    && __gnu_parallel::__is_parallel(__parallelism_tag)))
-	{
-	  _Tp __res = __init;
-	  __gnu_parallel::__accumulate_selector<__RAIter>
-	    __my_selector;
-	  __gnu_parallel::
-	    for_each_template_random_access_ed(__begin, __end,
-					    __gnu_parallel::_Nothing(),
-					    __my_selector,
-					    __gnu_parallel::
-					    __accumulate_binop_reduct
-					    <_BinaryOperation>(__binary_op),
-					    __res, __res, -1);
-	  return __res;
-	}
+            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
+            >= __gnu_parallel::_Settings::get().accumulate_minimal_n
+            && __gnu_parallel::__is_parallel(__parallelism_tag)))
+        {
+          _Tp __res = __init;
+          __gnu_parallel::__accumulate_selector<__RAIter>
+            __my_selector;
+          __gnu_parallel::
+            for_each_template_random_access_ed(__begin, __end,
+                                            __gnu_parallel::_Nothing(),
+                                            __my_selector,
+                                            __gnu_parallel::
+                                            __accumulate_binop_reduct
+                                            <_BinaryOperation>(__binary_op),
+                                            __res, __res, -1);
+          return __res;
+        }
       else
-	return accumulate(__begin, __end, __init, __binary_op, 
-			  __gnu_parallel::sequential_tag());
+        return accumulate(__begin, __end, __init, __binary_op, 
+                          __gnu_parallel::sequential_tag());
     }
 
   // Public interface.
   template<typename _IIter, typename _Tp>
     inline _Tp
     accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-	       __gnu_parallel::_Parallelism __parallelism_tag)
+               __gnu_parallel::_Parallelism __parallelism_tag)
     {
       typedef std::iterator_traits<_IIter> _IteratorTraits;
       typedef typename _IteratorTraits::value_type _ValueType;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
 
       return __accumulate_switch(__begin, __end, __init,
-			       __gnu_parallel::_Plus<_Tp, _ValueType>(),
-			       _IteratorCategory(), __parallelism_tag);
+                               __gnu_parallel::_Plus<_Tp, _ValueType>(),
+                               _IteratorCategory(), __parallelism_tag);
     }
 
   template<typename _IIter, typename _Tp>
@@ -135,31 +136,31 @@ namespace __parallel
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
 
       return __accumulate_switch(__begin, __end, __init,
-			       __gnu_parallel::_Plus<_Tp, _ValueType>(),
-			       _IteratorCategory());
+                               __gnu_parallel::_Plus<_Tp, _ValueType>(),
+                               _IteratorCategory());
     }
 
   template<typename _IIter, typename _Tp, typename _BinaryOperation>
     inline _Tp
     accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-	       _BinaryOperation __binary_op, 
-	       __gnu_parallel::_Parallelism __parallelism_tag)
+               _BinaryOperation __binary_op, 
+               __gnu_parallel::_Parallelism __parallelism_tag)
     {
       typedef iterator_traits<_IIter> _IteratorTraits;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
       return __accumulate_switch(__begin, __end, __init, __binary_op, 
-			       _IteratorCategory(), __parallelism_tag);
+                               _IteratorCategory(), __parallelism_tag);
     }
 
   template<typename _IIter, typename _Tp, typename _BinaryOperation>
     inline _Tp
     accumulate(_IIter __begin, _IIter __end, _Tp __init, 
-	       _BinaryOperation __binary_op) 
+               _BinaryOperation __binary_op) 
     {
       typedef iterator_traits<_IIter> _IteratorTraits;
       typedef typename _IteratorTraits::iterator_category _IteratorCategory;
       return __accumulate_switch(__begin, __end, __init, __binary_op, 
-			       _IteratorCategory());
+                               _IteratorCategory());
     }
 
 
@@ -167,75 +168,76 @@ namespace __parallel
   template<typename _IIter1, typename _IIter2, typename _Tp>
     inline _Tp
     inner_product(_IIter1 __first1, _IIter1 __last1, 
-		  _IIter2 __first2, _Tp __init,
-		  __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init); }
+                  _IIter2 __first2, _Tp __init,
+                  __gnu_parallel::sequential_tag)
+    { return _GLIBCXX_STD_P::inner_product(
+                               __first1, __last1, __first2, __init); }
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename BinaryFunction1, typename BinaryFunction2>
+           typename BinaryFunction1, typename BinaryFunction2>
     inline _Tp
     inner_product(_IIter1 __first1, _IIter1 __last1, 
-		  _IIter2 __first2, _Tp __init, BinaryFunction1 __binary_op1, 
-		  BinaryFunction2 __binary_op2, __gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init, 
-					   __binary_op1, __binary_op2); }
+                  _IIter2 __first2, _Tp __init, BinaryFunction1 __binary_op1, 
+                  BinaryFunction2 __binary_op2, __gnu_parallel::sequential_tag)
+    { return _GLIBCXX_STD_P::inner_product(__first1, __last1, __first2, __init,
+                                           __binary_op1, __binary_op2); }
 
   // Parallel algorithm for random access iterators.
   template<typename _RAIter1, typename _RAIter2,
-	   typename _Tp, typename BinaryFunction1, typename BinaryFunction2>
+           typename _Tp, typename BinaryFunction1, typename BinaryFunction2>
     _Tp
     __inner_product_switch(_RAIter1 __first1,
-			 _RAIter1 __last1,
-			 _RAIter2 __first2, _Tp __init,
-			 BinaryFunction1 __binary_op1,
-			 BinaryFunction2 __binary_op2,
-			 random_access_iterator_tag,
-			 random_access_iterator_tag,
-			 __gnu_parallel::_Parallelism __parallelism_tag
-			 = __gnu_parallel::parallel_unbalanced)
+                         _RAIter1 __last1,
+                         _RAIter2 __first2, _Tp __init,
+                         BinaryFunction1 __binary_op1,
+                         BinaryFunction2 __binary_op2,
+                         random_access_iterator_tag,
+                         random_access_iterator_tag,
+                         __gnu_parallel::_Parallelism __parallelism_tag
+                         = __gnu_parallel::parallel_unbalanced)
     {
       if (_GLIBCXX_PARALLEL_CONDITION((__last1 - __first1)
-				      >= __gnu_parallel::_Settings::get().
-				      accumulate_minimal_n
-				      && __gnu_parallel::
-				      __is_parallel(__parallelism_tag)))
-	{
-	  _Tp __res = __init;
-	  __gnu_parallel::
-	    __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);
-	  return __res;
-	}
+                                      >= __gnu_parallel::_Settings::get().
+                                      accumulate_minimal_n
+                                      && __gnu_parallel::
+                                      __is_parallel(__parallelism_tag)))
+        {
+          _Tp __res = __init;
+          __gnu_parallel::
+            __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);
+          return __res;
+        }
       else
-	return inner_product(__first1, __last1, __first2, __init, 
-			     __gnu_parallel::sequential_tag());
+        return inner_product(__first1, __last1, __first2, __init, 
+                             __gnu_parallel::sequential_tag());
     }
 
   // No parallelism for input iterators.
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename BinaryFunction1, typename BinaryFunction2,
-	   typename _IteratorTag1, typename _IteratorTag2>
+           typename BinaryFunction1, typename BinaryFunction2,
+           typename _IteratorTag1, typename _IteratorTag2>
     inline _Tp
     __inner_product_switch(_IIter1 __first1, _IIter1 __last1, 
-			 _IIter2 __first2, _Tp __init, 
-			 BinaryFunction1 __binary_op1,
-			 BinaryFunction2 __binary_op2, 
-			 _IteratorTag1, _IteratorTag2)
+                         _IIter2 __first2, _Tp __init, 
+                         BinaryFunction1 __binary_op1,
+                         BinaryFunction2 __binary_op2, 
+                         _IteratorTag1, _IteratorTag2)
     { return inner_product(__first1, __last1, __first2, __init,
-			   __binary_op1, __binary_op2,
-			   __gnu_parallel::sequential_tag()); }
+                           __binary_op1, __binary_op2,
+                           __gnu_parallel::sequential_tag()); }
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename BinaryFunction1, typename BinaryFunction2>
+           typename BinaryFunction1, typename BinaryFunction2>
     inline _Tp
     inner_product(_IIter1 __first1, _IIter1 __last1, 
-		  _IIter2 __first2, _Tp __init, BinaryFunction1 __binary_op1, 
-		  BinaryFunction2 __binary_op2, 
-		  __gnu_parallel::_Parallelism __parallelism_tag)
+                  _IIter2 __first2, _Tp __init, BinaryFunction1 __binary_op1, 
+                  BinaryFunction2 __binary_op2, 
+                  __gnu_parallel::_Parallelism __parallelism_tag)
     {
       typedef iterator_traits<_IIter1> _TraitsType1;
       typedef typename _TraitsType1::iterator_category _IteratorCategory1;
@@ -243,17 +245,18 @@ namespace __parallel
       typedef iterator_traits<_IIter2> _TraitsType2;
       typedef typename _TraitsType2::iterator_category _IteratorCategory2;
 
-      return __inner_product_switch(__first1, __last1, __first2, __init, __binary_op1, 
-				  __binary_op2, _IteratorCategory1(), 
-				  _IteratorCategory2(), __parallelism_tag);
+      return __inner_product_switch(
+               __first1, __last1, __first2, __init, __binary_op1,
+               __binary_op2, _IteratorCategory1(), _IteratorCategory2(),
+               __parallelism_tag);
     }
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename BinaryFunction1, typename BinaryFunction2>
+           typename BinaryFunction1, typename BinaryFunction2>
     inline _Tp
     inner_product(_IIter1 __first1, _IIter1 __last1, 
-		  _IIter2 __first2, _Tp __init, BinaryFunction1 __binary_op1, 
-		  BinaryFunction2 __binary_op2)
+                  _IIter2 __first2, _Tp __init, BinaryFunction1 __binary_op1, 
+                  BinaryFunction2 __binary_op2)
     {
       typedef iterator_traits<_IIter1> _TraitsType1;
       typedef typename _TraitsType1::iterator_category _IteratorCategory1;
@@ -261,16 +264,16 @@ namespace __parallel
       typedef iterator_traits<_IIter2> _TraitsType2;
       typedef typename _TraitsType2::iterator_category _IteratorCategory2;
 
-      return __inner_product_switch(__first1, __last1, __first2, __init, __binary_op1, 
-				  __binary_op2, _IteratorCategory1(),
-				  _IteratorCategory2());
+      return __inner_product_switch(
+               __first1, __last1, __first2, __init, __binary_op1, __binary_op2,
+               _IteratorCategory1(), _IteratorCategory2());
     }
 
   template<typename _IIter1, typename _IIter2, typename _Tp>
     inline _Tp
     inner_product(_IIter1 __first1, _IIter1 __last1, 
-		  _IIter2 __first2, _Tp __init, 
-		  __gnu_parallel::_Parallelism __parallelism_tag)
+                  _IIter2 __first2, _Tp __init, 
+                  __gnu_parallel::_Parallelism __parallelism_tag)
     {
       typedef iterator_traits<_IIter1> traits_type1;
       typedef typename traits_type1::value_type value_type1;
@@ -278,19 +281,19 @@ namespace __parallel
       typedef typename traits_type2::value_type value_type2;
 
       typedef typename
-	__gnu_parallel::_Multiplies<value_type1, value_type2>::__result
+        __gnu_parallel::_Multiplies<value_type1, value_type2>::__result
         _MultipliesResultType;
       return inner_product(__first1, __last1, __first2, __init,
                            __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(),
                            __gnu_parallel::
-			   _Multiplies<value_type1, value_type2>(),
+                           _Multiplies<value_type1, value_type2>(),
                            __parallelism_tag);
     }
 
   template<typename _IIter1, typename _IIter2, typename _Tp>
     inline _Tp
     inner_product(_IIter1 __first1, _IIter1 __last1, 
-		  _IIter2 __first2, _Tp __init)
+                  _IIter2 __first2, _Tp __init)
     {
       typedef iterator_traits<_IIter1> traits_type1;
       typedef typename traits_type1::value_type value_type1;
@@ -298,55 +301,55 @@ namespace __parallel
       typedef typename traits_type2::value_type value_type2;
 
       typedef typename
-	__gnu_parallel::_Multiplies<value_type1, value_type2>::__result
+        __gnu_parallel::_Multiplies<value_type1, value_type2>::__result
         _MultipliesResultType;
       return inner_product(__first1, __last1, __first2, __init,
                            __gnu_parallel::_Plus<_Tp, _MultipliesResultType>(),
                            __gnu_parallel::
-			   _Multiplies<value_type1, value_type2>());
+                           _Multiplies<value_type1, value_type2>());
     }
 
   // Sequential fallback.
   template<typename _IIter, typename _OutputIterator>
     inline _OutputIterator
     partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result,
-		__gnu_parallel::sequential_tag)
+                __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::partial_sum(__begin, __end, __result); }
 
   // Sequential fallback.
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     inline _OutputIterator
     partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result,
-		_BinaryOperation __bin_op, __gnu_parallel::sequential_tag)
+                _BinaryOperation __bin_op, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::partial_sum(__begin, __end, __result, __bin_op); }
 
   // Sequential fallback for input iterator case.
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation, typename _IteratorTag1,
-	   typename _IteratorTag2>
+           typename _BinaryOperation, typename _IteratorTag1,
+           typename _IteratorTag2>
     inline _OutputIterator
     __partial_sum_switch(_IIter __begin, _IIter __end,
-		       _OutputIterator __result, _BinaryOperation __bin_op,
-		       _IteratorTag1, _IteratorTag2)
+                       _OutputIterator __result, _BinaryOperation __bin_op,
+                       _IteratorTag1, _IteratorTag2)
     { return _GLIBCXX_STD_P::partial_sum(__begin, __end, __result, __bin_op); }
 
   // Parallel algorithm for random access iterators.
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     _OutputIterator
     __partial_sum_switch(_IIter __begin, _IIter __end,
-		       _OutputIterator __result, _BinaryOperation __bin_op,
-		       random_access_iterator_tag, random_access_iterator_tag)
+                       _OutputIterator __result, _BinaryOperation __bin_op,
+                       random_access_iterator_tag, random_access_iterator_tag)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(
-	    static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-	    >= __gnu_parallel::_Settings::get().partial_sum_minimal_n))
-	return __gnu_parallel::__parallel_partial_sum(__begin, __end,
-						    __result, __bin_op);
+            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
+            >= __gnu_parallel::_Settings::get().partial_sum_minimal_n))
+        return __gnu_parallel::__parallel_partial_sum(__begin, __end,
+                                                    __result, __bin_op);
       else
-	return partial_sum(__begin, __end, __result, __bin_op,
-			   __gnu_parallel::sequential_tag());
+        return partial_sum(__begin, __end, __result, __bin_op,
+                           __gnu_parallel::sequential_tag());
     }
 
   // Public interface.
@@ -360,10 +363,10 @@ namespace __parallel
 
   // Public interface
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     inline _OutputIterator
     partial_sum(_IIter __begin, _IIter __end, _OutputIterator __result,
-		_BinaryOperation __binary_op)
+                _BinaryOperation __binary_op)
     {
       typedef iterator_traits<_IIter> traitsi_type;
       typedef typename traitsi_type::iterator_category _IIteratorCategory;
@@ -372,100 +375,104 @@ namespace __parallel
       typedef typename _OTraitsType::iterator_category _OIterCategory;
 
       return __partial_sum_switch(__begin, __end, __result, __binary_op,
-				_IIteratorCategory(), _OIterCategory());
+                                _IIteratorCategory(), _OIterCategory());
     }
 
   // Sequential fallback.
   template<typename _IIter, typename _OutputIterator>
     inline _OutputIterator
-    adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result, __gnu_parallel::sequential_tag)
+    adjacent_difference(_IIter __begin, _IIter __end, _OutputIterator __result,
+                        __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::adjacent_difference(__begin, __end, __result); }
 
   // Sequential fallback.
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     inline _OutputIterator
     adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result, _BinaryOperation __bin_op,
-			__gnu_parallel::sequential_tag)
-    { return _GLIBCXX_STD_P::adjacent_difference(__begin, __end, __result, __bin_op); }
+                        _OutputIterator __result, _BinaryOperation __bin_op,
+                        __gnu_parallel::sequential_tag)
+    { return _GLIBCXX_STD_P::adjacent_difference(
+                               __begin, __end, __result, __bin_op); }
 
   // Sequential fallback for input iterator case.
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation, typename _IteratorTag1,
-	   typename _IteratorTag2>
+           typename _BinaryOperation, typename _IteratorTag1,
+           typename _IteratorTag2>
     inline _OutputIterator
-    __adjacent_difference_switch(_IIter __begin, _IIter __end,
-			       _OutputIterator __result, _BinaryOperation __bin_op,
-			     _IteratorTag1, _IteratorTag2)
-    { return adjacent_difference(__begin, __end, __result, __bin_op,  
-				 __gnu_parallel::sequential_tag()); }
+    __adjacent_difference_switch(
+      _IIter __begin, _IIter __end, _OutputIterator __result,
+      _BinaryOperation __bin_op, _IteratorTag1, _IteratorTag2)
+    { return adjacent_difference(__begin, __end, __result, __bin_op,
+                                 __gnu_parallel::sequential_tag()); }
 
   // Parallel algorithm for random access iterators.
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     _OutputIterator
-    __adjacent_difference_switch(_IIter __begin, _IIter __end,
-			       _OutputIterator __result, _BinaryOperation __bin_op,
-			       random_access_iterator_tag, 
-			       random_access_iterator_tag,
-			       __gnu_parallel::_Parallelism __parallelism_tag
-			       = __gnu_parallel::parallel_balanced)
+    __adjacent_difference_switch(
+      _IIter __begin, _IIter __end, _OutputIterator __result,
+      _BinaryOperation __bin_op,
+      random_access_iterator_tag, random_access_iterator_tag,
+      __gnu_parallel::_Parallelism __parallelism_tag
+                               = __gnu_parallel::parallel_balanced)
     {
       if (_GLIBCXX_PARALLEL_CONDITION(
-	    static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
-	    >= __gnu_parallel::_Settings::get().adjacent_difference_minimal_n
-	    && __gnu_parallel::__is_parallel(__parallelism_tag)))
-	{
-	  bool __dummy = true;
-	  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));
-	  __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);
-	  return __functionality.finish_iterator;
-	}
+            static_cast<__gnu_parallel::_SequenceIndex>(__end - __begin)
+            >= __gnu_parallel::_Settings::get().adjacent_difference_minimal_n
+            && __gnu_parallel::__is_parallel(__parallelism_tag)))
+        {
+          bool __dummy = true;
+          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));
+          __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);
+          return __functionality.finish_iterator;
+        }
       else
-	return adjacent_difference(__begin, __end, __result, __bin_op, 
-				   __gnu_parallel::sequential_tag());
+        return adjacent_difference(__begin, __end, __result, __bin_op, 
+                                   __gnu_parallel::sequential_tag());
     }
 
   // Public interface.
   template<typename _IIter, typename _OutputIterator>
     inline _OutputIterator
     adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result,
-			__gnu_parallel::_Parallelism __parallelism_tag)
+                        _OutputIterator __result,
+                        __gnu_parallel::_Parallelism __parallelism_tag)
     {
       typedef iterator_traits<_IIter> _TraitsType;
       typedef typename _TraitsType::value_type _ValueType;
-      return adjacent_difference(__begin, __end, __result, std::minus<_ValueType>(),
-				 __parallelism_tag);
+      return adjacent_difference(
+               __begin, __end, __result, std::minus<_ValueType>(),
+               __parallelism_tag);
     }
 
   template<typename _IIter, typename _OutputIterator>
     inline _OutputIterator
     adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result)
+                        _OutputIterator __result)
     {
       typedef iterator_traits<_IIter> _TraitsType;
       typedef typename _TraitsType::value_type _ValueType;
-      return adjacent_difference(__begin, __end, __result, std::minus<_ValueType>());
+      return adjacent_difference(__begin, __end, __result,
+                                 std::minus<_ValueType>());
     }
 
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     inline _OutputIterator
     adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result, _BinaryOperation __binary_op,
-			__gnu_parallel::_Parallelism __parallelism_tag)
+                        _OutputIterator __result, _BinaryOperation __binary_op,
+                        __gnu_parallel::_Parallelism __parallelism_tag)
     {
       typedef iterator_traits<_IIter> traitsi_type;
       typedef typename traitsi_type::iterator_category _IIteratorCategory;
@@ -473,16 +480,16 @@ namespace __parallel
       typedef iterator_traits<_OutputIterator> _OTraitsType;
       typedef typename _OTraitsType::iterator_category _OIterCategory;
 
-      return __adjacent_difference_switch(__begin, __end, __result, __binary_op,
-					_IIteratorCategory(), 
-					_OIterCategory(), __parallelism_tag);
+      return __adjacent_difference_switch(
+               __begin, __end, __result, __binary_op,
+               _IIteratorCategory(), _OIterCategory(), __parallelism_tag);
     }
 
   template<typename _IIter, typename _OutputIterator,
-	   typename _BinaryOperation>
+           typename _BinaryOperation>
     inline _OutputIterator
     adjacent_difference(_IIter __begin, _IIter __end,
-			_OutputIterator __result, _BinaryOperation __binary_op)
+                        _OutputIterator __result, _BinaryOperation __binary_op)
     {
       typedef iterator_traits<_IIter> traitsi_type;
       typedef typename traitsi_type::iterator_category _IIteratorCategory;
@@ -490,9 +497,9 @@ namespace __parallel
       typedef iterator_traits<_OutputIterator> _OTraitsType;
       typedef typename _OTraitsType::iterator_category _OIterCategory;
 
-      return __adjacent_difference_switch(__begin, __end, __result, __binary_op,
-					_IIteratorCategory(), 
-					_OIterCategory());
+      return __adjacent_difference_switch(
+               __begin, __end, __result, __binary_op,
+               _IIteratorCategory(), _OIterCategory());
     }
 } // end namespace
 } // end namespace
diff --git a/libstdc++-v3/include/parallel/numericfwd.h b/libstdc++-v3/include/parallel/numericfwd.h
index 754d5ba0d9e..e8d887be05c 100644
--- a/libstdc++-v3/include/parallel/numericfwd.h
+++ b/libstdc++-v3/include/parallel/numericfwd.h
@@ -61,24 +61,24 @@ namespace __parallel
   template<typename _IIter, typename _Tp, typename _BinaryOper>
     _Tp
     accumulate(_IIter, _IIter, _Tp, _BinaryOper,
-	       __gnu_parallel::sequential_tag);
+               __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _Tp, typename _BinaryOper>
     _Tp
     accumulate(_IIter, _IIter, _Tp, _BinaryOper,
-	       __gnu_parallel::_Parallelism);
+               __gnu_parallel::_Parallelism);
 
   template<typename _IIter, typename _Tp, typename _BinaryOper,
-	   typename _Tag>
+           typename _Tag>
     _Tp
     __accumulate_switch(_IIter, _IIter, _Tp, _BinaryOper, _Tag);
 
   template<typename _RAIter, typename _Tp, typename _BinaryOper>
     _Tp
     __accumulate_switch(_RAIter, _RAIter, _Tp, _BinaryOper,
-		      random_access_iterator_tag,
-		      __gnu_parallel::_Parallelism __parallelism
-		      = __gnu_parallel::parallel_unbalanced);
+                      random_access_iterator_tag,
+                      __gnu_parallel::_Parallelism __parallelism
+                      = __gnu_parallel::parallel_unbalanced);
 
   template<typename _IIter, typename _OIter>
     _OIter
@@ -91,36 +91,36 @@ namespace __parallel
   template<typename _IIter, typename _OIter>
     _OIter
     adjacent_difference(_IIter, _IIter, _OIter,
-			__gnu_parallel::sequential_tag);
+                        __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _OIter, typename _BinaryOper>
     _OIter
     adjacent_difference(_IIter, _IIter, _OIter, _BinaryOper, 
-			__gnu_parallel::sequential_tag);
+                        __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _OIter>
     _OIter
     adjacent_difference(_IIter, _IIter, _OIter,
-			__gnu_parallel::_Parallelism);
+                        __gnu_parallel::_Parallelism);
 
   template<typename _IIter, typename _OIter, typename _BinaryOper>
     _OIter
     adjacent_difference(_IIter, _IIter, _OIter, _BinaryOper, 
-			__gnu_parallel::_Parallelism);
+                        __gnu_parallel::_Parallelism);
 
   template<typename _IIter, typename _OIter, typename _BinaryOper,
-	   typename _Tag1, typename _Tag2>
+           typename _Tag1, typename _Tag2>
     _OIter
     __adjacent_difference_switch(_IIter, _IIter, _OIter, _BinaryOper,
-			       _Tag1, _Tag2);
+                               _Tag1, _Tag2);
 
   template<typename _IIter, typename _OIter, typename _BinaryOper>
     _OIter
     __adjacent_difference_switch(_IIter, _IIter, _OIter, _BinaryOper, 
-			       random_access_iterator_tag, 
-			       random_access_iterator_tag, 
-			       __gnu_parallel::_Parallelism __parallelism
-			       = __gnu_parallel::parallel_unbalanced);
+                               random_access_iterator_tag, 
+                               random_access_iterator_tag, 
+                               __gnu_parallel::_Parallelism __parallelism
+                               = __gnu_parallel::parallel_unbalanced);
 
   template<typename _IIter1, typename _IIter2, typename _Tp>
     _Tp
@@ -129,46 +129,46 @@ namespace __parallel
   template<typename _IIter1, typename _IIter2, typename _Tp>
     _Tp
     inner_product(_IIter1, _IIter1, _IIter2, _Tp,
-		  __gnu_parallel::sequential_tag);
+                  __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _Tp>
     _Tp
     inner_product(_IIter1, _IIter1, _IIter2, _Tp,
-		  __gnu_parallel::_Parallelism);
+                  __gnu_parallel::_Parallelism);
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename _BinaryFunction1, typename _BinaryFunction2>
+           typename _BinaryFunction1, typename _BinaryFunction2>
     _Tp
     inner_product(_IIter1, _IIter1, _IIter2, _Tp,
-		  _BinaryFunction1, _BinaryFunction2);
+                  _BinaryFunction1, _BinaryFunction2);
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename _BinaryFunction1, typename _BinaryFunction2>
+           typename _BinaryFunction1, typename _BinaryFunction2>
     _Tp
     inner_product(_IIter1, _IIter1, _IIter2, _Tp, _BinaryFunction1,
-		  _BinaryFunction2, __gnu_parallel::sequential_tag);
+                  _BinaryFunction2, __gnu_parallel::sequential_tag);
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename BinaryFunction1, typename BinaryFunction2>
+           typename BinaryFunction1, typename BinaryFunction2>
     _Tp
     inner_product(_IIter1, _IIter1, _IIter2, _Tp, BinaryFunction1,
-		  BinaryFunction2, __gnu_parallel::_Parallelism);
+                  BinaryFunction2, __gnu_parallel::_Parallelism);
 
   template<typename _RAIter1, typename _RAIter2, typename _Tp,
-	   typename BinaryFunction1, typename BinaryFunction2>
+           typename BinaryFunction1, typename BinaryFunction2>
     _Tp
     __inner_product_switch(_RAIter1, _RAIter1, _RAIter2, _Tp, BinaryFunction1, 
-			 BinaryFunction2, random_access_iterator_tag, 
-			 random_access_iterator_tag, 
-			 __gnu_parallel::_Parallelism
-			 = __gnu_parallel::parallel_unbalanced);
+                         BinaryFunction2, random_access_iterator_tag, 
+                         random_access_iterator_tag, 
+                         __gnu_parallel::_Parallelism
+                         = __gnu_parallel::parallel_unbalanced);
 
   template<typename _IIter1, typename _IIter2, typename _Tp,
-	   typename _BinaryFunction1, typename _BinaryFunction2,
-	   typename _Tag1, typename _Tag2>
+           typename _BinaryFunction1, typename _BinaryFunction2,
+           typename _Tag1, typename _Tag2>
     _Tp
     __inner_product_switch(_IIter1, _IIter1, _IIter2, _Tp, _BinaryFunction1, 
-			 _BinaryFunction2, _Tag1, _Tag2);
+                         _BinaryFunction2, _Tag1, _Tag2);
 
 
   template<typename _IIter, typename _OIter>
@@ -178,7 +178,7 @@ namespace __parallel
   template<typename _IIter, typename _OIter, typename _BinaryOper>
     _OIter
     partial_sum(_IIter, _IIter, _OIter, _BinaryOper,
-		__gnu_parallel::sequential_tag);
+                __gnu_parallel::sequential_tag);
 
   template<typename _IIter, typename _OIter>
     _OIter
@@ -189,14 +189,14 @@ namespace __parallel
     partial_sum(_IIter, _IIter, _OIter, _BinaryOper);
 
   template<typename _IIter, typename _OIter, typename _BinaryOper,
-	   typename _Tag1, typename _Tag2>
+           typename _Tag1, typename _Tag2>
     _OIter
     __partial_sum_switch(_IIter, _IIter, _OIter, _BinaryOper, _Tag1, _Tag2);
 
   template<typename _IIter, typename _OIter, typename _BinaryOper>
     _OIter
     __partial_sum_switch(_IIter, _IIter, _OIter, _BinaryOper,
-		       random_access_iterator_tag, random_access_iterator_tag);
+                       random_access_iterator_tag, random_access_iterator_tag);
 } // end namespace
 } // end namespace
 
diff --git a/libstdc++-v3/include/parallel/omp_loop.h b/libstdc++-v3/include/parallel/omp_loop.h
index 5f5df679524..7147961df98 100644
--- a/libstdc++-v3/include/parallel/omp_loop.h
+++ b/libstdc++-v3/include/parallel/omp_loop.h
@@ -59,18 +59,15 @@ namespace __gnu_parallel
   *  @return User-supplied functor (that may contain a part of the result).
   */
 template<typename _RAIter,
-	 typename _Op,
-	 typename _Fu,
-	 typename _Red,
-	 typename _Result>
+         typename _Op,
+         typename _Fu,
+         typename _Red,
+         typename _Result>
   _Op
-  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)
+  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)
   {
     typedef typename
         std::iterator_traits<_RAIter>::difference_type
@@ -95,7 +92,7 @@ template<typename _RAIter,
 
         _ThreadIndex __iam = omp_get_thread_num();
 
-#      pragma omp for schedule(dynamic, _Settings::get().workstealing_chunk_size)
+#pragma omp for schedule(dynamic, _Settings::get().workstealing_chunk_size)
         for (_DifferenceType __pos = 0; __pos < __length; ++__pos)
           __thread_results[__iam] =
               __r(__thread_results[__iam], __f(__o, __begin+__pos));
diff --git a/libstdc++-v3/include/parallel/omp_loop_static.h b/libstdc++-v3/include/parallel/omp_loop_static.h
index 5244d11494a..cc3443ba1a9 100644
--- a/libstdc++-v3/include/parallel/omp_loop_static.h
+++ b/libstdc++-v3/include/parallel/omp_loop_static.h
@@ -59,18 +59,15 @@ namespace __gnu_parallel
    *  @return User-supplied functor (that may contain a part of the result).
    */
 template<typename _RAIter,
-	 typename _Op,
-	 typename _Fu,
-	 typename _Red,
-	 typename _Result>
+         typename _Op,
+         typename _Fu,
+         typename _Red,
+         typename _Result>
   _Op
-  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)
+  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)
   {
     typedef typename
       std::iterator_traits<_RAIter>::difference_type
@@ -95,9 +92,10 @@ template<typename _RAIter,
 
         _ThreadIndex __iam = omp_get_thread_num();
 
-#       pragma omp for schedule(static, _Settings::get().workstealing_chunk_size)
+#pragma omp for schedule(static, _Settings::get().workstealing_chunk_size)
         for (_DifferenceType __pos = 0; __pos < __length; ++__pos)
-          __thread_results[__iam] = __r(__thread_results[__iam], __f(__o, __begin+__pos));
+          __thread_results[__iam] = __r(__thread_results[__iam],
+                                        __f(__o, __begin+__pos));
       } //parallel
 
     for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
diff --git a/libstdc++-v3/include/parallel/par_loop.h b/libstdc++-v3/include/parallel/par_loop.h
index 68dee423eda..0a71831342e 100644
--- a/libstdc++-v3/include/parallel/par_loop.h
+++ b/libstdc++-v3/include/parallel/par_loop.h
@@ -60,18 +60,15 @@ namespace __gnu_parallel
   *  @return User-supplied functor (that may contain a part of the result).
   */
 template<typename _RAIter,
-	 typename _Op,
-	 typename _Fu,
-	 typename _Red,
-	 typename _Result>
+         typename _Op,
+         typename _Fu,
+         typename _Red,
+         typename _Result>
   _Op
-  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)
+  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)
   {
     typedef std::iterator_traits<_RAIter> _TraitsType;
     typedef typename _TraitsType::difference_type _DifferenceType;
@@ -87,15 +84,17 @@ template<typename _RAIter,
 #       pragma omp single
           {
             __num_threads = omp_get_num_threads();
-            __thread_results = static_cast<_Result*>(
-                                ::operator new(__num_threads * sizeof(_Result)));
+            __thread_results =
+              static_cast<_Result*>(
+                            ::operator new(__num_threads * sizeof(_Result)));
             __constructed = new bool[__num_threads];
           }
 
         _ThreadIndex __iam = omp_get_thread_num();
 
         // Neutral element.
-        _Result* __reduct = static_cast<_Result*>(::operator new(sizeof(_Result)));
+        _Result* __reduct =
+                   static_cast<_Result*>(::operator new(sizeof(_Result)));
 
         _DifferenceType
             __start = equally_split_point(__length, __num_threads, __iam),
diff --git a/libstdc++-v3/include/parallel/partial_sum.h b/libstdc++-v3/include/parallel/partial_sum.h
index da04270b6e2..b121e1ff8c7 100644
--- a/libstdc++-v3/include/parallel/partial_sum.h
+++ b/libstdc++-v3/include/parallel/partial_sum.h
@@ -52,13 +52,13 @@ namespace __gnu_parallel
   *  element is unknown in general.
   *  @return End iterator of output sequence. */
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _BinaryOperation>
+         typename _OutputIterator,
+         typename _BinaryOperation>
   _OutputIterator
-  __parallel_partial_sum_basecase(_IIter __begin, _IIter __end,
-				_OutputIterator __result, _BinaryOperation __bin_op,
-				typename std::iterator_traits
-				<_IIter>::value_type __value)
+  __parallel_partial_sum_basecase(
+    _IIter __begin, _IIter __end, _OutputIterator __result,
+    _BinaryOperation __bin_op,
+    typename std::iterator_traits <_IIter>::value_type __value)
   {
     if (__begin == __end)
       return __result;
@@ -84,13 +84,13 @@ template<typename _IIter,
     *  @return End iterator of output sequence.
     */
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _BinaryOperation>
+         typename _OutputIterator,
+         typename _BinaryOperation>
   _OutputIterator
-  __parallel_partial_sum_linear(_IIter __begin, _IIter __end,
-			      _OutputIterator __result, _BinaryOperation __bin_op,
-			      typename std::iterator_traits
-			      <_IIter>::difference_type __n)
+  __parallel_partial_sum_linear(
+        _IIter __begin, _IIter __end, _OutputIterator __result,
+        _BinaryOperation __bin_op,
+        typename std::iterator_traits<_IIter>::difference_type __n)
   {
     typedef std::iterator_traits<_IIter> _TraitsType;
     typedef typename _TraitsType::value_type _ValueType;
@@ -128,8 +128,8 @@ template<typename _IIter,
               {
                 _DifferenceType __chunk_length =
                     ((double)__n
-		     / ((double)__num_threads + __s.partial_sum_dilation)),
-		  __borderstart = __n - __num_threads * __chunk_length;
+                     / ((double)__num_threads + __s.partial_sum_dilation)),
+                  __borderstart = __n - __num_threads * __chunk_length;
                 __borders[0] = 0;
                 for (int __i = 1; __i < (__num_threads + 1); ++__i)
                   {
@@ -140,7 +140,7 @@ template<typename _IIter,
               }
 
             __sums = static_cast<_ValueType*>(::operator new(sizeof(_ValueType)
-							   * __num_threads));
+                                                           * __num_threads));
             _OutputIterator __target_end;
           } //single
 
@@ -148,33 +148,35 @@ template<typename _IIter,
         if (__iam == 0)
           {
             *__result = *__begin;
-            __parallel_partial_sum_basecase(__begin + 1, __begin + __borders[1],
-					  __result + 1, __bin_op, *__begin);
+            __parallel_partial_sum_basecase(
+                __begin + 1, __begin + __borders[1], __result + 1,
+                __bin_op, *__begin);
             ::new(&(__sums[__iam])) _ValueType(*(__result + __borders[1] - 1));
           }
         else
           {
             ::new(&(__sums[__iam]))
-	      _ValueType(std::accumulate(__begin + __borders[__iam] + 1,
-					 __begin + __borders[__iam + 1],
-					 *(__begin + __borders[__iam]),
-					 __bin_op,
-					 __gnu_parallel::sequential_tag()));
+              _ValueType(std::accumulate(__begin + __borders[__iam] + 1,
+                                         __begin + __borders[__iam + 1],
+                                         *(__begin + __borders[__iam]),
+                                         __bin_op,
+                                         __gnu_parallel::sequential_tag()));
           }
 
 #       pragma omp barrier
 
 #       pragma omp single
-          __parallel_partial_sum_basecase(
-              __sums + 1, __sums + __num_threads, __sums + 1, __bin_op, __sums[0]);
+          __parallel_partial_sum_basecase(__sums + 1, __sums + __num_threads,
+                                          __sums + 1, __bin_op, __sums[0]);
 
 #       pragma omp barrier
 
         // Still same team.
-        __parallel_partial_sum_basecase(__begin + __borders[__iam + 1],
-				      __begin + __borders[__iam + 2],
-				      __result + __borders[__iam + 1], __bin_op,
-				      __sums[__iam]);
+        __parallel_partial_sum_basecase(
+                __begin + __borders[__iam + 1],
+                __begin + __borders[__iam + 2],
+                __result + __borders[__iam + 1],
+                __bin_op, __sums[__iam]);
       } //parallel
 
     ::operator delete(__sums);
@@ -190,8 +192,8 @@ template<typename _IIter,
   *  @param __bin_op Associative binary function.
   *  @return End iterator of output sequence. */
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _BinaryOperation>
+         typename _OutputIterator,
+         typename _BinaryOperation>
   _OutputIterator
   __parallel_partial_sum(_IIter __begin, _IIter __end,
                        _OutputIterator __result, _BinaryOperation __bin_op)
@@ -208,7 +210,8 @@ template<typename _IIter,
       {
       case LINEAR:
         // Need an initial offset.
-        return __parallel_partial_sum_linear(__begin, __end, __result, __bin_op, __n);
+        return __parallel_partial_sum_linear(
+                 __begin, __end, __result, __bin_op, __n);
       default:
     // Partial_sum algorithm not implemented.
         _GLIBCXX_PARALLEL_ASSERT(0);
diff --git a/libstdc++-v3/include/parallel/partition.h b/libstdc++-v3/include/parallel/partition.h
index 399ad418d31..f50e83bbfd3 100644
--- a/libstdc++-v3/include/parallel/partition.h
+++ b/libstdc++-v3/include/parallel/partition.h
@@ -88,9 +88,10 @@ template<typename _RAIter, typename _Predicate>
             __reserved_right = new bool[__num_threads];
 
             if (__s.partition_chunk_share > 0.0)
-              __chunk_size = std::max<_DifferenceType>(__s.partition_chunk_size,
-				    (double)__n * __s.partition_chunk_share
-						     / (double)__num_threads);
+              __chunk_size = std::max<_DifferenceType>(
+                __s.partition_chunk_size,
+                (double)__n * __s.partition_chunk_share /
+                    (double)__num_threads);
             else
               __chunk_size = __s.partition_chunk_size;
           }
@@ -99,7 +100,8 @@ template<typename _RAIter, typename _Predicate>
           {
 #           pragma omp single
               {
-                _DifferenceType __num_chunks = (__right - __left + 1) / __chunk_size;
+                _DifferenceType __num_chunks
+                    = (__right - __left + 1) / __chunk_size;
 
                 for (int __r = 0; __r < __num_threads; ++__r)
                   {
@@ -198,7 +200,8 @@ template<typename _RAIter, typename _Predicate>
                 && __thread_left_border >= __leftnew)
               {
                 // Chunk already in place, reserve spot.
-                __reserved_left[(__left - (__thread_left_border + 1)) / __chunk_size]
+                __reserved_left
+                  [(__left - (__thread_left_border + 1)) / __chunk_size]
                     = true;
               }
 
@@ -208,7 +211,7 @@ template<typename _RAIter, typename _Predicate>
               {
                 // Chunk already in place, reserve spot.
                 __reserved_right[((__thread_right_border - 1) - __right)
-			       / __chunk_size] = true;
+                               / __chunk_size] = true;
               }
 
 #           pragma omp barrier
@@ -233,9 +236,9 @@ template<typename _RAIter, typename _Predicate>
 #endif
 
                 std::swap_ranges(__begin + __thread_left_border
-				 - (__chunk_size - 1),
-				 __begin + __thread_left_border + 1,
-				 __begin + __swapstart);
+                                 - (__chunk_size - 1),
+                                 __begin + __thread_left_border + 1,
+                                 __begin + __swapstart);
               }
 
             if (thread_right >= __thread_right_border
@@ -257,9 +260,10 @@ template<typename _RAIter, typename _Predicate>
                 _GLIBCXX_PARALLEL_ASSERT(__swapstart != -1);
 #endif
 
-                std::swap_ranges(__begin + __thread_right_border,
-				 __begin + __thread_right_border + __chunk_size,
-				 __begin + __swapstart);
+                std::swap_ranges(
+                    __begin + __thread_right_border,
+                    __begin + __thread_right_border + __chunk_size,
+                    __begin + __swapstart);
               }
 #if _GLIBCXX_ASSERTIONS
 #             pragma omp barrier
@@ -328,7 +332,7 @@ template<typename _RAIter, typename _Predicate>
 template<typename _RAIter, typename _Compare>
   void 
   parallel_nth_element(_RAIter __begin, _RAIter __nth, 
-		       _RAIter __end, _Compare __comp)
+                       _RAIter __end, _Compare __comp)
   {
     typedef std::iterator_traits<_RAIter> _TraitsType;
     typedef typename _TraitsType::value_type _ValueType;
@@ -355,18 +359,19 @@ template<typename _RAIter, typename _Compare>
         __pivot_pos = __end - 1;
 
         // XXX _Compare must have first__ValueType, second__ValueType,
-	// _ResultType
+        // _ResultType
         // _Compare == __gnu_parallel::_Lexicographic<S, int,
-	// __gnu_parallel::_Less<S, S> >
+        // __gnu_parallel::_Less<S, S> >
         // __pivot_pos == std::pair<S, int>*
         // XXX binder2nd only for _RAIters??
         __gnu_parallel::binder2nd<_Compare, _ValueType, _ValueType, bool>
-	  __pred(__comp, *__pivot_pos);
+          __pred(__comp, *__pivot_pos);
 
         // Divide, leave pivot unchanged in last place.
         _RAIter __split_pos1, __split_pos2;
-        __split_pos1 = __begin + __parallel_partition(__begin, __end - 1, __pred,
-						__get_max_threads());
+        __split_pos1 = __begin
+                       + __parallel_partition(__begin, __end - 1, __pred,
+                                              __get_max_threads());
 
         // Left side: < __pivot_pos; __right side: >= __pivot_pos
 
@@ -377,18 +382,18 @@ template<typename _RAIter, typename _Compare>
 
         // In case all elements are equal, __split_pos1 == 0
         if ((__split_pos1 + 1 - __begin) < (__n >> 7)
-	    || (__end - __split_pos1) < (__n >> 7))
+            || (__end - __split_pos1) < (__n >> 7))
           {
             // Very unequal split, one part smaller than one 128th
             // elements not strictly larger than the pivot.
             __gnu_parallel::__unary_negate<__gnu_parallel::
-	      __binder1st<_Compare, _ValueType, _ValueType, bool>, _ValueType>
-	      __pred(__gnu_parallel::__binder1st<_Compare, _ValueType,
-		   _ValueType, bool>(__comp, *__pivot_pos));
+              __binder1st<_Compare, _ValueType, _ValueType, bool>, _ValueType>
+              __pred(__gnu_parallel::__binder1st<_Compare, _ValueType,
+                   _ValueType, bool>(__comp, *__pivot_pos));
 
             // Find other end of pivot-equal range.
             __split_pos2 = __gnu_sequential::partition(__split_pos1 + 1,
-						     __end, __pred);
+                                                     __end, __pred);
           }
         else
           // Only skip the pivot.
@@ -415,8 +420,8 @@ template<typename _RAIter, typename _Compare>
 template<typename _RAIter, typename _Compare>
   void
   parallel_partial_sort(_RAIter __begin,
-			_RAIter __middle,
-			_RAIter __end, _Compare __comp)
+                        _RAIter __middle,
+                        _RAIter __end, _Compare __comp)
   {
     parallel_nth_element(__begin, __middle, __end, __comp);
     std::sort(__begin, __middle, __comp);
diff --git a/libstdc++-v3/include/parallel/queue.h b/libstdc++-v3/include/parallel/queue.h
index 587fa5312e2..348bb1ac900 100644
--- a/libstdc++-v3/include/parallel/queue.h
+++ b/libstdc++-v3/include/parallel/queue.h
@@ -59,7 +59,7 @@ namespace __gnu_parallel
       _SequenceIndex _M_max_size;
 
       /** @brief Cyclic __begin and __end pointers contained in one
-	  atomically changeable value. */
+          atomically changeable value. */
       _GLIBCXX_VOLATILE _CASable _M_borders;
 
     public:
@@ -67,9 +67,9 @@ namespace __gnu_parallel
        *  @param _M_max_size Maximal number of elements to be contained. */
       _RestrictedBoundedConcurrentQueue(_SequenceIndex _M_max_size)
       {
-	this->_M_max_size = _M_max_size;
-	_M_base = new _Tp[_M_max_size];
-	_M_borders = __encode2(0, 0);
+        this->_M_max_size = _M_max_size;
+        _M_base = new _Tp[_M_max_size];
+        _M_borders = __encode2(0, 0);
 #pragma omp flush
       }
 
@@ -82,16 +82,16 @@ namespace __gnu_parallel
       void
       push_front(const _Tp& __t)
       {
-	_CASable __former_borders = _M_borders;
-	int __former_front, __former_back;
-	decode2(__former_borders, __former_front, __former_back);
-	*(_M_base + __former_front % _M_max_size) = __t;
+        _CASable __former_borders = _M_borders;
+        int __former_front, __former_back;
+        decode2(__former_borders, __former_front, __former_back);
+        *(_M_base + __former_front % _M_max_size) = __t;
 #if _GLIBCXX_ASSERTIONS
-	// Otherwise: front - back > _M_max_size eventually.
-	_GLIBCXX_PARALLEL_ASSERT(((__former_front + 1) - __former_back)
-				 <= _M_max_size);
+        // Otherwise: front - back > _M_max_size eventually.
+        _GLIBCXX_PARALLEL_ASSERT(((__former_front + 1) - __former_back)
+                                 <= _M_max_size);
 #endif
-	__fetch_and_add(&_M_borders, __encode2(1, 0));
+        __fetch_and_add(&_M_borders, __encode2(1, 0));
       }
 
       /** @brief Pops one element from the queue at the front end.
@@ -99,50 +99,56 @@ namespace __gnu_parallel
       bool
       pop_front(_Tp& __t)
       {
-	int __former_front, __former_back;
+        int __former_front, __former_back;
 #pragma omp flush
-	decode2(_M_borders, __former_front, __former_back);
-	while (__former_front > __former_back)
-	  {
-	    // Chance.
-	    _CASable __former_borders = __encode2(__former_front, __former_back);
-	    _CASable __new_borders = __encode2(__former_front - 1, __former_back);
-	    if (__compare_and_swap(&_M_borders, __former_borders, __new_borders))
-	      {
-		__t = *(_M_base + (__former_front - 1) % _M_max_size);
-		return true;
-	      }
+        decode2(_M_borders, __former_front, __former_back);
+        while (__former_front > __former_back)
+          {
+            // Chance.
+            _CASable
+                __former_borders = __encode2(__former_front, __former_back);
+            _CASable
+                __new_borders = __encode2(__former_front - 1, __former_back);
+            if (__compare_and_swap(
+                  &_M_borders, __former_borders, __new_borders))
+              {
+                __t = *(_M_base + (__former_front - 1) % _M_max_size);
+                return true;
+              }
 #pragma omp flush
-	    decode2(_M_borders, __former_front, __former_back);
-	  }
-	return false;
+            decode2(_M_borders, __former_front, __former_back);
+          }
+        return false;
       }
 
       /** @brief Pops one element from the queue at the front end.
        *  Must not be called concurrently with pop_front(). */
       bool
-      pop_back(_Tp& __t)	//queue behavior
+      pop_back(_Tp& __t)        //queue behavior
       {
-	int __former_front, __former_back;
+        int __former_front, __former_back;
 #pragma omp flush
-	decode2(_M_borders, __former_front, __former_back);
-	while (__former_front > __former_back)
-	  {
-	    // Chance.
-	    _CASable __former_borders = __encode2(__former_front, __former_back);
-	    _CASable __new_borders = __encode2(__former_front, __former_back + 1);
-	    if (__compare_and_swap(&_M_borders, __former_borders, __new_borders))
-	      {
-		__t = *(_M_base + __former_back % _M_max_size);
-		return true;
-	      }
+        decode2(_M_borders, __former_front, __former_back);
+        while (__former_front > __former_back)
+          {
+            // Chance.
+            _CASable
+              __former_borders = __encode2(__former_front, __former_back);
+            _CASable
+              __new_borders = __encode2(__former_front, __former_back + 1);
+            if (__compare_and_swap(
+                  &_M_borders, __former_borders, __new_borders))
+              {
+                __t = *(_M_base + __former_back % _M_max_size);
+                return true;
+              }
 #pragma omp flush
-	    decode2(_M_borders, __former_front, __former_back);
-	  }
-	return false;
+            decode2(_M_borders, __former_front, __former_back);
+          }
+        return false;
       }
   };
-}	//namespace __gnu_parallel
+}       //namespace __gnu_parallel
 
 #undef _GLIBCXX_VOLATILE
 
diff --git a/libstdc++-v3/include/parallel/quicksort.h b/libstdc++-v3/include/parallel/quicksort.h
index 60f4b23bcd8..1ed46b4a77f 100644
--- a/libstdc++-v3/include/parallel/quicksort.h
+++ b/libstdc++-v3/include/parallel/quicksort.h
@@ -49,12 +49,12 @@ namespace __gnu_parallel
   template<typename _RAIter, typename _Compare>
     typename std::iterator_traits<_RAIter>::difference_type
     __parallel_sort_qs_divide(_RAIter __begin,
-			    _RAIter __end,
-			    _Compare __comp, typename std::iterator_traits
-			    <_RAIter>::difference_type __pivot_rank,
-			    typename std::iterator_traits
-			    <_RAIter>::difference_type
-			    __num_samples, _ThreadIndex __num_threads)
+                            _RAIter __end,
+                            _Compare __comp, typename std::iterator_traits
+                            <_RAIter>::difference_type __pivot_rank,
+                            typename std::iterator_traits
+                            <_RAIter>::difference_type
+                            __num_samples, _ThreadIndex __num_threads)
     {
       typedef std::iterator_traits<_RAIter> _TraitsType;
       typedef typename _TraitsType::value_type _ValueType;
@@ -65,15 +65,15 @@ namespace __gnu_parallel
 
       // Allocate uninitialized, to avoid default constructor.
       _ValueType* __samples =
-	static_cast<_ValueType*>(::operator new(__num_samples
-						* sizeof(_ValueType)));
+        static_cast<_ValueType*>(::operator new(__num_samples
+                                                * sizeof(_ValueType)));
 
       for (_DifferenceType __s = 0; __s < __num_samples; ++__s)
-	{
-	  const unsigned long long __index = static_cast<unsigned long long>(__s)
-	    * __n / __num_samples;
-	  ::new(&(__samples[__s])) _ValueType(__begin[__index]);
-	}
+        {
+          const unsigned long long __index
+            = static_cast<unsigned long long>(__s) * __n / __num_samples;
+          ::new(&(__samples[__s])) _ValueType(__begin[__index]);
+        }
 
       __gnu_sequential::sort(__samples, __samples + __num_samples, __comp);
 
@@ -99,47 +99,47 @@ namespace __gnu_parallel
   template<typename _RAIter, typename _Compare>
     void
     __parallel_sort_qs_conquer(_RAIter __begin,
-			     _RAIter __end,
-			     _Compare __comp,
-			     _ThreadIndex __num_threads)
+                             _RAIter __end,
+                             _Compare __comp,
+                             _ThreadIndex __num_threads)
     {
       typedef std::iterator_traits<_RAIter> _TraitsType;
       typedef typename _TraitsType::value_type _ValueType;
       typedef typename _TraitsType::difference_type _DifferenceType;
 
       if (__num_threads <= 1)
-	{
-	  __gnu_sequential::sort(__begin, __end, __comp);
-	  return;
-	}
+        {
+          __gnu_sequential::sort(__begin, __end, __comp);
+          return;
+        }
 
       _DifferenceType __n = __end - __begin, __pivot_rank;
 
       if (__n <= 1)
-	return;
+        return;
 
       _ThreadIndex __num_threads_left;
 
       if ((__num_threads % 2) == 1)
-	__num_threads_left = __num_threads / 2 + 1;
+        __num_threads_left = __num_threads / 2 + 1;
       else
-	__num_threads_left = __num_threads / 2;
+        __num_threads_left = __num_threads / 2;
 
       __pivot_rank = __n * __num_threads_left / __num_threads;
 
       _DifferenceType __split =
-	__parallel_sort_qs_divide(__begin, __end, __comp, __pivot_rank,
-				_Settings::get().sort_qs_num_samples_preset,
-				__num_threads);
+        __parallel_sort_qs_divide(__begin, __end, __comp, __pivot_rank,
+                                _Settings::get().sort_qs_num_samples_preset,
+                                __num_threads);
 
 #pragma omp parallel sections num_threads(2)
       {
 #pragma omp section
-	__parallel_sort_qs_conquer(__begin, __begin + __split,
-				 __comp, __num_threads_left);
+        __parallel_sort_qs_conquer(__begin, __begin + __split,
+                                 __comp, __num_threads_left);
 #pragma omp section
-	__parallel_sort_qs_conquer(__begin + __split, __end,
-				 __comp, __num_threads - __num_threads_left);
+        __parallel_sort_qs_conquer(__begin + __split, __end,
+                                 __comp, __num_threads - __num_threads_left);
       }
     }
 
@@ -155,9 +155,9 @@ namespace __gnu_parallel
   template<typename _RAIter, typename _Compare>
     void
     __parallel_sort_qs(_RAIter __begin,
-		     _RAIter __end,
-		     _Compare __comp,
-		     _ThreadIndex __num_threads)
+                     _RAIter __end,
+                     _Compare __comp,
+                     _ThreadIndex __num_threads)
     {
       _GLIBCXX_CALL(__n)
 
@@ -171,7 +171,8 @@ namespace __gnu_parallel
       if (__num_threads > __n)
         __num_threads = static_cast<_ThreadIndex>(__n);
 
-      __parallel_sort_qs_conquer(__begin, __begin + __n, __comp, __num_threads);
+      __parallel_sort_qs_conquer(
+        __begin, __begin + __n, __comp, __num_threads);
     }
 
 } //namespace __gnu_parallel
diff --git a/libstdc++-v3/include/parallel/random_number.h b/libstdc++-v3/include/parallel/random_number.h
index 12f646b2eb2..6447087ebbb 100644
--- a/libstdc++-v3/include/parallel/random_number.h
+++ b/libstdc++-v3/include/parallel/random_number.h
@@ -41,14 +41,14 @@ namespace __gnu_parallel
   class _RandomNumber
   {
   private:
-    std::tr1::mt19937 	_M_mt;
-    uint64 		_M_supremum;
-    uint64 		_M_rand_sup;
-    double 		_M_supremum_reciprocal;
-    double 		_M_rand_sup_reciprocal;
+    std::tr1::mt19937   _M_mt;
+    uint64              _M_supremum;
+    uint64              _M_rand_sup;
+    double              _M_supremum_reciprocal;
+    double              _M_rand_sup_reciprocal;
 
     // Assumed to be twice as long as the usual random number.
-    uint64 		__cache;  
+    uint64              __cache;  
 
     // Bit results.
     int __bits_left;
@@ -56,17 +56,17 @@ namespace __gnu_parallel
     static uint32
     __scale_down(uint64 __x,
 #if _GLIBCXX_SCALE_DOWN_FPU
-	       uint64 /*_M_supremum*/, double _M_supremum_reciprocal)
+               uint64 /*_M_supremum*/, double _M_supremum_reciprocal)
 #else
                uint64 _M_supremum, double /*_M_supremum_reciprocal*/)
 #endif
-	{
+        {
 #if _GLIBCXX_SCALE_DOWN_FPU
-	  return uint32(__x * _M_supremum_reciprocal);
+          return uint32(__x * _M_supremum_reciprocal);
 #else
-	  return static_cast<uint32>(__x % _M_supremum);
+          return static_cast<uint32>(__x % _M_supremum);
 #endif
-	}
+        }
 
   public:
     /** @brief Default constructor. Seed with 0. */
@@ -94,12 +94,12 @@ namespace __gnu_parallel
     { return __scale_down(_M_mt(), _M_supremum, _M_supremum_reciprocal); }
 
     /** @brief Generate unsigned random 32-bit integer in the
-	interval @__c [0,local_supremum). */
+        interval @__c [0,local_supremum). */
     uint32
     operator()(uint64 local_supremum)
     {
       return __scale_down(_M_mt(), local_supremum,
-			double(local_supremum * _M_rand_sup_reciprocal));
+                        double(local_supremum * _M_rand_sup_reciprocal));
     }
 
     /** @brief Generate a number of random bits, run-time parameter.
@@ -111,10 +111,10 @@ namespace __gnu_parallel
       __cache = __cache >> __bits;
       __bits_left -= __bits;
       if (__bits_left < 32)
-	{
-	  __cache |= ((uint64(_M_mt())) << __bits_left);
-	  __bits_left += 32;
-	}
+        {
+          __cache |= ((uint64(_M_mt())) << __bits_left);
+          __bits_left += 32;
+        }
       return __res;
     }
 };
diff --git a/libstdc++-v3/include/parallel/random_shuffle.h b/libstdc++-v3/include/parallel/random_shuffle.h
index faab8d80f27..49d0d8557b7 100644
--- a/libstdc++-v3/include/parallel/random_shuffle.h
+++ b/libstdc++-v3/include/parallel/random_shuffle.h
@@ -70,7 +70,7 @@ template<typename _RAIter>
     _DifferenceType* _M_starts;
 
     /** @brief Number of the thread that will further process the
-	corresponding bin. */
+        corresponding bin. */
     _ThreadIndex* _M_bin_proc;
 
     /** @brief Number of bins to distribute to. */
@@ -131,7 +131,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
     _DRandomShufflingGlobalData<_RAIter>* _M_sd = d->_M_sd;
 
     // Indexing: _M_dist[bin][processor]
-    _DifferenceType __length = _M_sd->_M_starts[__iam + 1] - _M_sd->_M_starts[__iam];
+    _DifferenceType __length = _M_sd->_M_starts[__iam + 1] -
+                               _M_sd->_M_starts[__iam];
     _BinIndex* __oracles = new _BinIndex[__length];
     _DifferenceType* _M_dist = new _DifferenceType[_M_sd->_M_num_bins + 1];
     _BinIndex* _M_bin_proc = new _BinIndex[_M_sd->_M_num_bins];
@@ -161,12 +162,13 @@ template<typename _RAIter, typename RandomNumberGenerator>
 
 #   pragma omp single
     {
-      // Sum up bins, _M_sd->_M_dist[__s + 1][d->_M_num_threads] now contains the
-      // total number of items in bin __s
+      // Sum up bins, _M_sd->_M_dist[__s + 1][d->_M_num_threads] now contains
+      // the total number of items in bin __s
       for (_BinIndex __s = 0; __s < _M_sd->_M_num_bins; ++__s)
-        __gnu_sequential::partial_sum(_M_sd->_M_dist[__s + 1],
-                                      _M_sd->_M_dist[__s + 1] + d->_M_num_threads + 1,
-                                      _M_sd->_M_dist[__s + 1]);
+        __gnu_sequential::partial_sum(
+          _M_sd->_M_dist[__s + 1],
+          _M_sd->_M_dist[__s + 1] + d->_M_num_threads + 1,
+          _M_sd->_M_dist[__s + 1]);
     }
 
 #   pragma omp barrier
@@ -179,9 +181,9 @@ template<typename _RAIter, typename RandomNumberGenerator>
 
     for (_BinIndex __s = d->_M_bins_begin; __s < d->__bins_end; ++__s)
       {
-	for (int __t = 0; __t < d->_M_num_threads + 1; ++__t)
-	  _M_sd->_M_dist[__s + 1][__t] += __offset;
-	__offset = _M_sd->_M_dist[__s + 1][d->_M_num_threads];
+        for (int __t = 0; __t < d->_M_num_threads + 1; ++__t)
+          _M_sd->_M_dist[__s + 1][__t] += __offset;
+        __offset = _M_sd->_M_dist[__s + 1][d->_M_num_threads];
       }
 
     _M_sd->_M_temporaries[__iam] = static_cast<_ValueType*>(
@@ -208,7 +210,7 @@ template<typename _RAIter, typename RandomNumberGenerator>
 
         // Last column [d->_M_num_threads] stays unchanged.
         ::new(&(_M_temporaries[target_p][_M_dist[target_bin + 1]++]))
-	    _ValueType(*(_M_source + __i + __start));
+            _ValueType(*(_M_source + __i + __start));
       }
 
     delete[] __oracles;
@@ -223,12 +225,15 @@ template<typename _RAIter, typename RandomNumberGenerator>
       {
         _ValueType* __begin =
                     _M_sd->_M_temporaries[__iam] +
-                    ((__b == d->_M_bins_begin) ? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]),
+                    ((__b == d->_M_bins_begin)
+                      ? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]),
                   * __end =
-                    _M_sd->_M_temporaries[__iam] + _M_sd->_M_dist[__b + 1][d->_M_num_threads];
+                    _M_sd->_M_temporaries[__iam] +
+                      _M_sd->_M_dist[__b + 1][d->_M_num_threads];
         __sequential_random_shuffle(__begin, __end, __rng);
         std::copy(__begin, __end, _M_sd->_M_source + __global_offset +
-            ((__b == d->_M_bins_begin) ? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]));
+                  ((__b == d->_M_bins_begin)
+                  ? 0 : _M_sd->_M_dist[__b][d->_M_num_threads]));
       }
 
     ::operator delete(_M_sd->_M_temporaries[__iam]);
@@ -256,11 +261,11 @@ template<typename _Tp>
 template<typename _RAIter, typename RandomNumberGenerator>
   void
   __parallel_random_shuffle_drs(_RAIter __begin,
-			      _RAIter __end,
-			      typename std::iterator_traits
-			      <_RAIter>::difference_type __n,
-			      _ThreadIndex __num_threads,
-			      RandomNumberGenerator& __rng)
+                              _RAIter __end,
+                              typename std::iterator_traits
+                              <_RAIter>::difference_type __n,
+                              _ThreadIndex __num_threads,
+                              RandomNumberGenerator& __rng)
   {
     typedef std::iterator_traits<_RAIter> _TraitsType;
     typedef typename _TraitsType::value_type _ValueType;
@@ -343,7 +348,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
                 _M_sd._M_dist[0][0] = 0;
                 _M_sd._M_dist[__b][0] = 0;
               }
-            _M_starts = _M_sd._M_starts = new _DifferenceType[__num_threads + 1];
+            _M_starts = _M_sd._M_starts
+              = new _DifferenceType[__num_threads + 1];
             int bin_cursor = 0;
             _M_sd._M_num_bins = _M_num_bins;
             _M_sd._M_num_bits = __log2(_M_num_bins);
@@ -355,7 +361,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
             for (_ThreadIndex __i = 0; __i < __num_threads; ++__i)
               {
                 _M_starts[__i] = __start;
-                __start += (__i < __split) ? (__chunk_length + 1) : __chunk_length;
+                __start += (__i < __split)
+                           ? (__chunk_length + 1) : __chunk_length;
                 int __j = __pus[__i]._M_bins_begin = bin_cursor;
 
                 // Range of bins for this processor.
@@ -469,14 +476,16 @@ template<typename _RAIter, typename RandomNumberGenerator>
           }
 
         // Sum up bins.
-        __gnu_sequential::partial_sum(__dist0, __dist0 + _M_num_bins + 1, __dist0);
+        __gnu_sequential::
+            partial_sum(__dist0, __dist0 + _M_num_bins + 1, __dist0);
 
         for (int __b = 0; __b < _M_num_bins + 1; ++__b)
           __dist1[__b] = __dist0[__b];
 
         // Distribute according to oracles.
         for (_DifferenceType __i = 0; __i < __n; ++__i)
-          ::new(&(__target[(__dist0[__oracles[__i]])++])) _ValueType(*(__begin + __i));
+          ::new(&(__target[(__dist0[__oracles[__i]])++]))
+            _ValueType(*(__begin + __i));
 
         for (int __b = 0; __b < _M_num_bins; ++__b)
           {
@@ -511,7 +520,8 @@ template<typename _RAIter, typename RandomNumberGenerator>
     typedef std::iterator_traits<_RAIter> _TraitsType;
     typedef typename _TraitsType::difference_type _DifferenceType;
     _DifferenceType __n = __end - __begin;
-    __parallel_random_shuffle_drs(__begin, __end, __n, __get_max_threads(), __rng) ;
+    __parallel_random_shuffle_drs(
+      __begin, __end, __n, __get_max_threads(), __rng) ;
   }
 
 }
diff --git a/libstdc++-v3/include/parallel/search.h b/libstdc++-v3/include/parallel/search.h
index b0a9f6918bf..a253126d90a 100644
--- a/libstdc++-v3/include/parallel/search.h
+++ b/libstdc++-v3/include/parallel/search.h
@@ -76,8 +76,8 @@ template<typename _RAIter, typename _DifferenceTp>
    *  @param __pred Find predicate.
    *  @return Place of finding in first sequences. */
 template<typename __RAIter1,
-	 typename __RAIter2,
-	 typename _Pred>
+         typename __RAIter2,
+         typename _Pred>
   __RAIter1
   __search_template(__RAIter1 __begin1, __RAIter1 __end1,
                   __RAIter2 __begin2, __RAIter2 __end2,
@@ -126,7 +126,8 @@ template<typename __RAIter1,
 
         _ThreadIndex __iam = omp_get_thread_num();
 
-        _DifferenceType __start = __splitters[__iam], __stop = __splitters[__iam + 1];
+        _DifferenceType __start = __splitters[__iam],
+                        __stop = __splitters[__iam + 1];
 
         _DifferenceType __pos_in_pattern = 0;
         bool __found_pattern = false;
@@ -156,7 +157,8 @@ template<typename __RAIter1,
             // Make safe jump.
             __start += (__pos_in_pattern - __advances[__pos_in_pattern]);
             __pos_in_pattern =
-                (__advances[__pos_in_pattern] < 0) ? 0 : __advances[__pos_in_pattern];
+                (__advances[__pos_in_pattern] < 0) ?
+                  0 : __advances[__pos_in_pattern];
           }
       } //parallel
 
diff --git a/libstdc++-v3/include/parallel/set_operations.h b/libstdc++-v3/include/parallel/set_operations.h
index 4bbbf089363..ac669c55d5d 100644
--- a/libstdc++-v3/include/parallel/set_operations.h
+++ b/libstdc++-v3/include/parallel/set_operations.h
@@ -63,8 +63,8 @@ template<typename _IIter, typename _OutputIterator>
   }
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   struct symmetric_difference_func
   {
     typedef std::iterator_traits<_IIter> _TraitsType;
@@ -77,8 +77,8 @@ template<typename _IIter,
 
     _OutputIterator
     _M_invoke(_IIter __a, _IIter __b,
-	   _IIter __c, _IIter d,
-	   _OutputIterator __r) const
+           _IIter __c, _IIter d,
+           _OutputIterator __r) const
     {
       while (__a != __b && __c != d)
         {
@@ -105,7 +105,7 @@ template<typename _IIter,
 
     _DifferenceType
     __count(_IIter __a, _IIter __b,
-	  _IIter __c, _IIter d) const
+          _IIter __c, _IIter d) const
     {
       _DifferenceType __counter = 0;
 
@@ -142,8 +142,8 @@ template<typename _IIter,
 
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   struct __difference_func
   {
     typedef std::iterator_traits<_IIter> _TraitsType;
@@ -179,7 +179,7 @@ template<typename _IIter,
 
     _DifferenceType
     __count(_IIter __a, _IIter __b,
-	  _IIter __c, _IIter d) const
+          _IIter __c, _IIter d) const
     {
       _DifferenceType __counter = 0;
 
@@ -210,8 +210,8 @@ template<typename _IIter,
 
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   struct __intersection_func
   {
     typedef std::iterator_traits<_IIter> _TraitsType;
@@ -246,7 +246,7 @@ template<typename _IIter,
 
     _DifferenceType
     __count(_IIter __a, _IIter __b,
-	  _IIter __c, _IIter d) const
+          _IIter __c, _IIter d) const
     {
       _DifferenceType __counter = 0;
 
@@ -315,7 +315,7 @@ template<class _IIter, class _OutputIterator, class _Compare>
 
     _DifferenceType
     __count(_IIter __a, _IIter __b,
-	  _IIter __c, _IIter d) const
+          _IIter __c, _IIter d) const
     {
       _DifferenceType __counter = 0;
 
@@ -348,8 +348,8 @@ template<class _IIter, class _OutputIterator, class _Compare>
   };
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename Operation>
+         typename _OutputIterator,
+         typename Operation>
   _OutputIterator
   __parallel_set_operation(_IIter __begin1, _IIter __end1,
                          _IIter __begin2, _IIter __end2,
@@ -370,7 +370,7 @@ template<typename _IIter,
     const _DifferenceType size = (__end1 - __begin1) + (__end2 - __begin2);
 
     const _IteratorPair __sequence[ 2 ] =
-        { std::make_pair(__begin1, __end1), std::make_pair(__begin2, __end2) } ;
+      { std::make_pair(__begin1, __end1), std::make_pair(__begin2, __end2) };
     _OutputIterator return_value = __result;
     _DifferenceType *__borders;
     _IteratorPair *__block_begins;
@@ -400,7 +400,8 @@ template<typename _IIter,
         _IIter __offset[2];
         const _DifferenceType __rank = __borders[__iam + 1];
 
-        multiseq_partition(__sequence, __sequence + 2, __rank, __offset, __op._M_comp);
+        multiseq_partition(__sequence, __sequence + 2,
+                           __rank, __offset, __op._M_comp);
 
         // allowed to read?
         // together
@@ -427,15 +428,16 @@ template<typename _IIter,
         if (__iam == 0)
           {
             // The first thread can copy already.
-            __lengths[ __iam ] = __op._M_invoke(__block_begin.first, block_end.first,
-                                       __block_begin.second, block_end.second,
-                                       __result)
+            __lengths[ __iam ] =
+              __op._M_invoke(__block_begin.first, block_end.first,
+                             __block_begin.second, block_end.second, __result)
                               - __result;
           }
         else
           {
-            __lengths[ __iam ] = __op.__count(__block_begin.first, block_end.first,
-                        __block_begin.second, block_end.second);
+            __lengths[ __iam ] =
+              __op.__count(__block_begin.first, block_end.first,
+                           __block_begin.second, block_end.second);
           }
 
         // Make sure everyone wrote their lengths.
@@ -453,7 +455,7 @@ template<typename _IIter,
 
             // Return the result iterator of the last block.
             return_value = __op._M_invoke(
-                __block_begin.first, __end1, __block_begin.second, __end2, __r);
+              __block_begin.first, __end1, __block_begin.second, __end2, __r);
 
           }
         else
@@ -471,52 +473,56 @@ template<typename _IIter,
 
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   inline _OutputIterator
   __parallel_set_union(_IIter __begin1, _IIter __end1,
                      _IIter __begin2, _IIter __end2,
                      _OutputIterator __result, _Compare _M_comp)
   {
-    return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result,
-        __union_func< _IIter, _OutputIterator, _Compare>(_M_comp));
+    return __parallel_set_operation(__begin1, __end1, __begin2, __end2,
+        __result, __union_func< _IIter, _OutputIterator, _Compare>(_M_comp));
   }
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   inline _OutputIterator
   __parallel_set_intersection(_IIter __begin1, _IIter __end1,
-                            _IIter __begin2, _IIter __end2,
-                            _OutputIterator __result, _Compare _M_comp)
+                              _IIter __begin2, _IIter __end2,
+                              _OutputIterator __result, _Compare _M_comp)
   {
-    return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result,
-        __intersection_func<_IIter, _OutputIterator, _Compare>(_M_comp));
+    return __parallel_set_operation(
+             __begin1, __end1, __begin2, __end2, __result,
+             __intersection_func<_IIter, _OutputIterator, _Compare>(_M_comp));
   }
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   inline _OutputIterator
   __parallel_set_difference(_IIter __begin1, _IIter __end1,
-                          _IIter __begin2, _IIter __end2,
-                          _OutputIterator __result, _Compare _M_comp)
+                            _IIter __begin2, _IIter __end2,
+                            _OutputIterator __result, _Compare _M_comp)
   {
-    return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result,
-        __difference_func<_IIter, _OutputIterator, _Compare>(_M_comp));
+    return __parallel_set_operation(
+             __begin1, __end1, __begin2, __end2, __result,
+             __difference_func<_IIter, _OutputIterator, _Compare>(_M_comp));
   }
 
 template<typename _IIter,
-	 typename _OutputIterator,
-	 typename _Compare>
+         typename _OutputIterator,
+         typename _Compare>
   inline _OutputIterator
   __parallel_set_symmetric_difference(_IIter __begin1, _IIter __end1,
-                                    _IIter __begin2, _IIter __end2,
-                                    _OutputIterator __result, _Compare _M_comp)
+                                      _IIter __begin2, _IIter __end2,
+                                      _OutputIterator __result,
+                                      _Compare _M_comp)
   {
-    return __parallel_set_operation(__begin1, __end1, __begin2, __end2, __result,
-        symmetric_difference_func<_IIter, _OutputIterator, _Compare>
-            (_M_comp));
+    return __parallel_set_operation(
+             __begin1, __end1, __begin2, __end2, __result,
+            symmetric_difference_func<_IIter, _OutputIterator, _Compare>
+              (_M_comp));
   }
 
 }
diff --git a/libstdc++-v3/include/parallel/settings.h b/libstdc++-v3/include/parallel/settings.h
index e68a0c4da9a..e83ecc50ea5 100644
--- a/libstdc++-v3/include/parallel/settings.h
+++ b/libstdc++-v3/include/parallel/settings.h
@@ -92,7 +92,12 @@
   * __gnu_parallel::_Settings::algorithm_strategy. Usually a decision
   * based on the input size.
   */
-#define _GLIBCXX_PARALLEL_CONDITION(__c) (__gnu_parallel::_Settings::get().algorithm_strategy != __gnu_parallel::force_sequential && ((__gnu_parallel::__get_max_threads() > 1 && (__c)) || __gnu_parallel::_Settings::get().algorithm_strategy == __gnu_parallel::force_parallel))
+#define _GLIBCXX_PARALLEL_CONDITION(__c) \
+  (__gnu_parallel::_Settings::get().algorithm_strategy \
+    != __gnu_parallel::force_sequential \
+  && ((__gnu_parallel::__get_max_threads() > 1 && (__c)) \
+     || __gnu_parallel::_Settings::get().algorithm_strategy \
+        == __gnu_parallel::force_parallel))
 
 /*
 inline bool
@@ -103,9 +108,9 @@ parallel_condition(bool __c)
   if (__s.algorithm_strategy != force_seqential)
     {
       if (__s.algorithm_strategy == force_parallel)
-	ret = true;
+        ret = true;
       else
-	ret = __get_max_threads() > 1 && __c;
+        ret = __get_max_threads() > 1 && __c;
     }
   return ret;
 }
@@ -113,156 +118,156 @@ parallel_condition(bool __c)
 
 namespace __gnu_parallel
 {
-  /// class _Settings 
-  /// Run-time settings for the parallel mode, including all tunable parameters.
+  /// class _Settings
+  /// Run-time settings for the parallel mode including all tunable parameters.
   struct _Settings
   {
-    _AlgorithmStrategy 		algorithm_strategy;
+    _AlgorithmStrategy          algorithm_strategy;
     
-    _SortAlgorithm 		sort_algorithm;
-    _PartialSumAlgorithm 	partial_sum_algorithm;
-    _MultiwayMergeAlgorithm 	multiway_merge_algorithm;
-    _FindAlgorithm 		find_algorithm;
+    _SortAlgorithm              sort_algorithm;
+    _PartialSumAlgorithm        partial_sum_algorithm;
+    _MultiwayMergeAlgorithm     multiway_merge_algorithm;
+    _FindAlgorithm              find_algorithm;
 
-    _SplittingAlgorithm 	sort_splitting;
-    _SplittingAlgorithm 	merge_splitting;
-    _SplittingAlgorithm 	multiway_merge_splitting;
+    _SplittingAlgorithm         sort_splitting;
+    _SplittingAlgorithm         merge_splitting;
+    _SplittingAlgorithm         multiway_merge_splitting;
 
     // Per-algorithm settings.
 
     /// Minimal input size for accumulate.
-    _SequenceIndex 		accumulate_minimal_n;
+    _SequenceIndex              accumulate_minimal_n;
 
     /// Minimal input size for adjacent_difference.
-    unsigned int 		adjacent_difference_minimal_n;
+    unsigned int                adjacent_difference_minimal_n;
 
     /// Minimal input size for count and count_if.
-    _SequenceIndex 		count_minimal_n;
+    _SequenceIndex              count_minimal_n;
 
     /// Minimal input size for fill.
-    _SequenceIndex 		fill_minimal_n;
+    _SequenceIndex              fill_minimal_n;
 
     /// Block size increase factor for find.
-    double 			find_increasing_factor;
+    double                      find_increasing_factor;
 
     /// Initial block size for find.
-    _SequenceIndex 		find_initial_block_size;
+    _SequenceIndex              find_initial_block_size;
 
     /// Maximal block size for find.
-    _SequenceIndex 		find_maximum_block_size;
+    _SequenceIndex              find_maximum_block_size;
 
     /// Start with looking for this many elements sequentially, for find.
-    _SequenceIndex 		find_sequential_search_size;
+    _SequenceIndex              find_sequential_search_size;
 
     /// Minimal input size for for_each.
-    _SequenceIndex 		for_each_minimal_n;
+    _SequenceIndex              for_each_minimal_n;
 
     /// Minimal input size for generate.
-    _SequenceIndex 		generate_minimal_n;
+    _SequenceIndex              generate_minimal_n;
 
     /// Minimal input size for max_element.
-    _SequenceIndex 		max_element_minimal_n;
+    _SequenceIndex              max_element_minimal_n;
 
     /// Minimal input size for merge.
-    _SequenceIndex 		merge_minimal_n;
+    _SequenceIndex              merge_minimal_n;
 
     /// Oversampling factor for merge.
-    unsigned int 		merge_oversampling;
+    unsigned int                merge_oversampling;
 
     /// Minimal input size for min_element.
-    _SequenceIndex 		min_element_minimal_n;
+    _SequenceIndex              min_element_minimal_n;
 
     /// Minimal input size for multiway_merge.
-    _SequenceIndex 		multiway_merge_minimal_n;
+    _SequenceIndex              multiway_merge_minimal_n;
 
     /// Oversampling factor for multiway_merge.
-    int 			multiway_merge_minimal_k;
+    int                         multiway_merge_minimal_k;
 
     /// Oversampling factor for multiway_merge.
-    unsigned int 		multiway_merge_oversampling;
+    unsigned int                multiway_merge_oversampling;
 
     /// Minimal input size for nth_element.
-    _SequenceIndex 		nth_element_minimal_n;
+    _SequenceIndex              nth_element_minimal_n;
 
     /// Chunk size for partition.
-    _SequenceIndex 		partition_chunk_size;
+    _SequenceIndex              partition_chunk_size;
 
     /// Chunk size for partition, relative to input size.  If > 0.0,
     /// this value overrides partition_chunk_size.
-    double 			partition_chunk_share;
+    double                      partition_chunk_share;
 
     /// Minimal input size for partition.
-    _SequenceIndex 		partition_minimal_n;
+    _SequenceIndex              partition_minimal_n;
 
     /// Minimal input size for partial_sort.
-    _SequenceIndex 		partial_sort_minimal_n;
+    _SequenceIndex              partial_sort_minimal_n;
 
     /// Ratio for partial_sum. Assume "sum and write result" to be
     /// this factor slower than just "sum".
-    float 			partial_sum_dilation;
+    float                       partial_sum_dilation;
 
     /// Minimal input size for partial_sum.
-    unsigned int 		partial_sum_minimal_n;
+    unsigned int                partial_sum_minimal_n;
 
     /// Minimal input size for random_shuffle.
-    unsigned int 		random_shuffle_minimal_n;
+    unsigned int                random_shuffle_minimal_n;
 
     /// Minimal input size for replace and replace_if.
-    _SequenceIndex 		replace_minimal_n;
+    _SequenceIndex              replace_minimal_n;
 
     /// Minimal input size for set_difference.
-    _SequenceIndex 		set_difference_minimal_n;
+    _SequenceIndex              set_difference_minimal_n;
 
     /// Minimal input size for set_intersection.
-    _SequenceIndex 		set_intersection_minimal_n;
+    _SequenceIndex              set_intersection_minimal_n;
 
     /// Minimal input size for set_symmetric_difference.
-    _SequenceIndex 		set_symmetric_difference_minimal_n;
+    _SequenceIndex              set_symmetric_difference_minimal_n;
 
     /// Minimal input size for set_union.
-    _SequenceIndex 		set_union_minimal_n;
+    _SequenceIndex              set_union_minimal_n;
 
     /// Minimal input size for parallel sorting.
-    _SequenceIndex 		sort_minimal_n;
+    _SequenceIndex              sort_minimal_n;
 
     /// Oversampling factor for parallel std::sort (MWMS).
-    unsigned int 		sort_mwms_oversampling;
+    unsigned int                sort_mwms_oversampling;
 
     /// Such many samples to take to find a good pivot (quicksort).
-    unsigned int 		sort_qs_num_samples_preset;
+    unsigned int                sort_qs_num_samples_preset;
 
     /// Maximal subsequence __length to switch to unbalanced __base case.
     /// Applies to std::sort with dynamically load-balanced quicksort.
-    _SequenceIndex 		sort_qsb_base_case_maximal_n;
+    _SequenceIndex              sort_qsb_base_case_maximal_n;
 
     /// Minimal input size for parallel std::transform.
-    _SequenceIndex 		transform_minimal_n;
+    _SequenceIndex              transform_minimal_n;
 
     /// Minimal input size for unique_copy. 
-    _SequenceIndex 		unique_copy_minimal_n;
+    _SequenceIndex              unique_copy_minimal_n;
 
-    _SequenceIndex 		workstealing_chunk_size;
+    _SequenceIndex              workstealing_chunk_size;
 
     // Hardware dependent tuning parameters.
 
     /// size of the L1 cache in bytes (underestimation).
-    unsigned long long 		L1_cache_size;
+    unsigned long long          L1_cache_size;
 
     /// size of the L2 cache in bytes (underestimation).
-    unsigned long long 		L2_cache_size;
+    unsigned long long          L2_cache_size;
 
     /// size of the Translation Lookaside Buffer (underestimation).
-    unsigned int 		TLB_size;
+    unsigned int                TLB_size;
 
     /// Overestimation of cache line size.  Used to avoid false
     /// sharing, i.e. elements of different threads are at least this
     /// amount apart.
-    unsigned int 		cache_line_size;
+    unsigned int                cache_line_size;
 
     // Statistics.
 
     /// The number of stolen ranges in load-balanced quicksort.
-    _SequenceIndex 		qsb_steals;
+    _SequenceIndex              qsb_steals;
 
     /// Get the global settings.
     _GLIBCXX_CONST static const _Settings&
@@ -273,7 +278,56 @@ namespace __gnu_parallel
     set(_Settings&) throw();
 
     explicit 
-    _Settings() : algorithm_strategy(heuristic), sort_algorithm(MWMS), partial_sum_algorithm(LINEAR), multiway_merge_algorithm(LOSER_TREE), find_algorithm(CONSTANT_SIZE_BLOCKS), sort_splitting(EXACT), merge_splitting(EXACT), multiway_merge_splitting(EXACT), accumulate_minimal_n(1000), adjacent_difference_minimal_n(1000), count_minimal_n(1000), fill_minimal_n(1000), find_increasing_factor(2.0), find_initial_block_size(256), find_maximum_block_size(8192), find_sequential_search_size(256), for_each_minimal_n(1000), generate_minimal_n(1000), max_element_minimal_n(1000), merge_minimal_n(1000), merge_oversampling(10), min_element_minimal_n(1000), multiway_merge_minimal_n(1000), multiway_merge_minimal_k(2), multiway_merge_oversampling(10), nth_element_minimal_n(1000), partition_chunk_size(1000), partition_chunk_share(0.0), partition_minimal_n(1000), partial_sort_minimal_n(1000), partial_sum_dilation(1.0f), partial_sum_minimal_n(1000), random_shuffle_minimal_n(1000), replace_minimal_n(1000), set_difference_minimal_n(1000), set_intersection_minimal_n(1000), set_symmetric_difference_minimal_n(1000), set_union_minimal_n(1000), sort_minimal_n(1000), sort_mwms_oversampling(10), sort_qs_num_samples_preset(100), sort_qsb_base_case_maximal_n(100), transform_minimal_n(1000), unique_copy_minimal_n(10000), workstealing_chunk_size(100), L1_cache_size(16 << 10), L2_cache_size(256 << 10), TLB_size(128), cache_line_size(64), qsb_steals(0)
+    _Settings() :
+            algorithm_strategy(heuristic),
+            sort_algorithm(MWMS),
+            partial_sum_algorithm(LINEAR),
+            multiway_merge_algorithm(LOSER_TREE),
+            find_algorithm(CONSTANT_SIZE_BLOCKS),
+            sort_splitting(EXACT),
+            merge_splitting(EXACT),
+            multiway_merge_splitting(EXACT),
+            accumulate_minimal_n(1000),
+            adjacent_difference_minimal_n(1000),
+            count_minimal_n(1000),
+            fill_minimal_n(1000),
+            find_increasing_factor(2.0),
+            find_initial_block_size(256),
+            find_maximum_block_size(8192),
+            find_sequential_search_size(256),
+            for_each_minimal_n(1000),
+            generate_minimal_n(1000),
+            max_element_minimal_n(1000),
+            merge_minimal_n(1000),
+            merge_oversampling(10),
+            min_element_minimal_n(1000),
+            multiway_merge_minimal_n(1000),
+            multiway_merge_minimal_k(2), multiway_merge_oversampling(10),
+            nth_element_minimal_n(1000),
+            partition_chunk_size(1000),
+            partition_chunk_share(0.0),
+            partition_minimal_n(1000),
+            partial_sort_minimal_n(1000),
+            partial_sum_dilation(1.0f),
+            partial_sum_minimal_n(1000),
+            random_shuffle_minimal_n(1000),
+            replace_minimal_n(1000),
+            set_difference_minimal_n(1000),
+            set_intersection_minimal_n(1000),
+            set_symmetric_difference_minimal_n(1000),
+            set_union_minimal_n(1000),
+            sort_minimal_n(1000),
+            sort_mwms_oversampling(10),
+            sort_qs_num_samples_preset(100),
+            sort_qsb_base_case_maximal_n(100),
+            transform_minimal_n(1000),
+            unique_copy_minimal_n(10000),
+            workstealing_chunk_size(100),
+            L1_cache_size(16 << 10),
+            L2_cache_size(256 << 10),
+            TLB_size(128),
+            cache_line_size(64),
+            qsb_steals(0)
     { }
   };
 }
diff --git a/libstdc++-v3/include/parallel/sort.h b/libstdc++-v3/include/parallel/sort.h
index 259b1982322..03b19210a82 100644
--- a/libstdc++-v3/include/parallel/sort.h
+++ b/libstdc++-v3/include/parallel/sort.h
@@ -54,13 +54,13 @@
 
 namespace __gnu_parallel
 {
-	//prototype
+        //prototype
   template<bool __stable, typename _RAIter,
            typename _Compare, typename _Parallelism>
   void
   parallel_sort(_RAIter __begin, _RAIter __end,
   _Compare __comp, _Parallelism __parallelism);
-	
+        
   /** 
    *  @brief Choose multiway mergesort, splitting variant at run-time,
    *  for parallel sorting.
@@ -138,7 +138,8 @@ namespace __gnu_parallel
 
     _GLIBCXX_PARALLEL_ASSERT(__stable == false);
 
-    __parallel_sort_qs(__begin, __end, __comp, __parallelism.__get_num_threads());
+    __parallel_sort_qs(__begin, __end, __comp,
+                       __parallelism.__get_num_threads());
   }
 
   /**
@@ -158,7 +159,8 @@ namespace __gnu_parallel
 
     _GLIBCXX_PARALLEL_ASSERT(__stable == false);
 
-    __parallel_sort_qsb(__begin, __end, __comp, __parallelism.__get_num_threads());
+    __parallel_sort_qsb(__begin, __end, __comp,
+                        __parallelism.__get_num_threads());
   }
 
 
@@ -215,11 +217,13 @@ namespace __gnu_parallel
 #endif
 #if _GLIBCXX_QUICKSORT
       else if (_Settings::get().sort_algorithm == QS)
-        __parallel_sort_qs(__begin, __end, __comp, __parallelism.__get_num_threads());
+        __parallel_sort_qs(__begin, __end, __comp,
+                           __parallelism.__get_num_threads());
 #endif
 #if _GLIBCXX_BAL_QUICKSORT
       else if (_Settings::get().sort_algorithm == QS_BALANCED)
-        __parallel_sort_qsb(__begin, __end, __comp, __parallelism.__get_num_threads());
+        __parallel_sort_qsb(__begin, __end, __comp,
+                            __parallelism.__get_num_threads());
 #endif
       else
         __gnu_sequential::sort(__begin, __end, __comp);
diff --git a/libstdc++-v3/include/parallel/types.h b/libstdc++-v3/include/parallel/types.h
index 70bfb64120a..3321f2d5bad 100644
--- a/libstdc++-v3/include/parallel/types.h
+++ b/libstdc++-v3/include/parallel/types.h
@@ -149,7 +149,8 @@ namespace __gnu_parallel
   static const int _CASable_bits = sizeof(_CASable) * 8;
 
   /// ::_CASable with the right half of bits set to 1.
-  static const _CASable _CASable_mask = ((_CASable(1) << (_CASable_bits / 2)) - 1);
+  static const _CASable _CASable_mask =
+                            ((_CASable(1) << (_CASable_bits / 2)) - 1);
 }
 
 #endif /* _GLIBCXX_PARALLEL_TYPES_H */
diff --git a/libstdc++-v3/include/parallel/unique_copy.h b/libstdc++-v3/include/parallel/unique_copy.h
index db2e820a708..327870e7d86 100644
--- a/libstdc++-v3/include/parallel/unique_copy.h
+++ b/libstdc++-v3/include/parallel/unique_copy.h
@@ -45,11 +45,11 @@ namespace __gnu_parallel
   *  @param __binary_pred Equality predicate.
   *  @return End iterator of result __sequence. */
 template<typename _IIter,
-	 class _OutputIterator,
-	 class _BinaryPredicate>
+         class _OutputIterator,
+         class _BinaryPredicate>
   _OutputIterator
   __parallel_unique_copy(_IIter __first, _IIter __last,
-                       _OutputIterator __result, _BinaryPredicate __binary_pred)
+    _OutputIterator __result, _BinaryPredicate __binary_pred)
   {
     _GLIBCXX_CALL(__last - __first)
 
@@ -72,10 +72,10 @@ template<typename _IIter,
       {
 #       pragma omp single
           {
-	    __num_threads = omp_get_num_threads();
-	    __borders = new _DifferenceType[__num_threads + 2];
-	    equally_split(size, __num_threads + 1, __borders);
-	    __counter = new _DifferenceType[__num_threads + 1];
+            __num_threads = omp_get_num_threads();
+            __borders = new _DifferenceType[__num_threads + 2];
+            equally_split(size, __num_threads + 1, __borders);
+            __counter = new _DifferenceType[__num_threads + 1];
           }
 
         _ThreadIndex __iam = omp_get_thread_num();
@@ -89,7 +89,7 @@ template<typename _IIter,
 
         if (__iam == 0)
         {
-          __begin = __borders[0] + 1;	// == 1
+          __begin = __borders[0] + 1;   // == 1
           __end = __borders[__iam + 1];
 
           ++__i;
@@ -112,8 +112,8 @@ template<typename _IIter,
           for (_IIter iter = __first + __begin; iter < __first + __end; ++iter)
             {
               if (!__binary_pred(*iter, *(iter - 1)))
-		++__i;
-	    }
+                ++__i;
+            }
         }
       __counter[__iam] = __i;
 
@@ -157,8 +157,8 @@ template<typename _IIter,
           for (_IIter iter = __first + __begin; iter < __first + __end; ++iter)
             {
               if (!__binary_pred(*iter, *(iter-1)))
-		*__iter_out++ = *iter;
-	    }
+                *__iter_out++ = *iter;
+            }
         }
     }
 
@@ -184,7 +184,7 @@ template<typename _IIter, class _OutputIterator>
     typedef typename std::iterator_traits<_IIter>::value_type
       _ValueType;
     return __parallel_unique_copy(__first, __last, __result,
-				std::equal_to<_ValueType>());
+                                std::equal_to<_ValueType>());
   }
 
 }//namespace __gnu_parallel
diff --git a/libstdc++-v3/include/parallel/workstealing.h b/libstdc++-v3/include/parallel/workstealing.h
index ad9208c4e2b..ca6eb0cc4d3 100644
--- a/libstdc++-v3/include/parallel/workstealing.h
+++ b/libstdc++-v3/include/parallel/workstealing.h
@@ -91,18 +91,15 @@ template<typename _DifferenceTp>
   *  @return User-supplied functor (that may contain a part of the result).
   */
 template<typename _RAIter,
-	 typename _Op,
-	 typename _Fu,
-	 typename _Red,
-	 typename _Result>
+         typename _Op,
+         typename _Fu,
+         typename _Red,
+         typename _Result>
   _Op
-  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)
+  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)
   {
     _GLIBCXX_CALL(__end - __begin)
 
@@ -111,13 +108,15 @@ template<typename _RAIter,
     
     const _Settings& __s = _Settings::get();
 
-    _DifferenceType __chunk_size = static_cast<_DifferenceType>(__s.workstealing_chunk_size);
+    _DifferenceType __chunk_size =
+        static_cast<_DifferenceType>(__s.workstealing_chunk_size);
 
     // How many jobs?
     _DifferenceType __length = (__bound < 0) ? (__end - __begin) : __bound;
 
     // To avoid false sharing in a cache line.
-    const int __stride = __s.cache_line_size * 10 / sizeof(_Job<_DifferenceType>) + 1;
+    const int __stride =
+                __s.cache_line_size * 10 / sizeof(_Job<_DifferenceType>) + 1;
 
     // Total number of threads currently working.
     _ThreadIndex __busy = 0;
@@ -132,8 +131,8 @@ template<typename _RAIter,
 
     // No more threads than jobs, at least one thread.
     _ThreadIndex __num_threads =
-        __gnu_parallel::max<_ThreadIndex>(1,
-            __gnu_parallel::min<_DifferenceType>(__length, __get_max_threads()));
+      __gnu_parallel::max<_ThreadIndex>(1,
+        __gnu_parallel::min<_DifferenceType>(__length, __get_max_threads()));
 
 #   pragma omp parallel shared(__busy) num_threads(__num_threads)
       {
@@ -184,7 +183,7 @@ template<typename _RAIter,
             (__length - 1) : ((__iam + 1) * (__length / __num_threads) - 1);
         __my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
 
-        // Init result with _M_first __value (to have a base value for reduction).
+        // Init result with _M_first value (to have a base value for reduction)
         if (__my_job._M_first <= __my_job._M_last)
           {
             // Cannot use volatile variable directly.
@@ -211,13 +210,15 @@ template<typename _RAIter,
                 // fetch-and-add call
                 // Reserve current job block (size __chunk_size) in my queue.
                 _DifferenceType current_job =
-                  __fetch_and_add<_DifferenceType>(&(__my_job._M_first), __chunk_size);
+                  __fetch_and_add<_DifferenceType>(
+                    &(__my_job._M_first), __chunk_size);
 
                 // Update _M_load, to make the three values consistent,
                 // _M_first might have been changed in the meantime
                 __my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
                 for (_DifferenceType job_counter = 0;
-                     job_counter < __chunk_size && current_job <= __my_job._M_last;
+                     job_counter < __chunk_size
+                       && current_job <= __my_job._M_last;
                      ++job_counter)
                   {
                     // Yes: process it!
@@ -254,7 +255,8 @@ template<typename _RAIter,
               }
             while (__busy > 0
               && ((__supposed_load <= 0)
-                || ((__supposed_first + __supposed_load - 1) != __supposed_last)));
+                || ((__supposed_first + __supposed_load - 1)
+                                                         != __supposed_last)));
 
             if (__busy == 0)
               break;
@@ -273,7 +275,8 @@ template<typename _RAIter,
                     __stolen_first + __steal - _DifferenceType(1);
 
                 __my_job._M_first = __stolen_first;
-                __my_job._M_last = __gnu_parallel::min(stolen_try, __supposed_last);
+                __my_job._M_last =
+                  __gnu_parallel::min(stolen_try, __supposed_last);
                 __my_job._M_load = __my_job._M_last - __my_job._M_first + 1;
 
                 // Has potential work again.