2008-01-14 Paolo Carlini <pcarlini@suse.de>

	* include/parallel/list_partition.h: Formatting fixes, inline tweaks.
	* include/parallel/numeric: Likewise.
	* include/parallel/balanced_quicksort.h: Likewise.
	* include/parallel/unique_copy.h: Likewise.
	* include/parallel/algobase.h: Likewise.
	* include/parallel/algo.h: Likewise.


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

7 files changed, 30 insertions, 21 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 46eea7aba59..94388f51373 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-14  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/parallel/list_partition.h: Formatting fixes, inline tweaks.
+	* include/parallel/numeric: Likewise.
+	* include/parallel/balanced_quicksort.h: Likewise.
+	* include/parallel/unique_copy.h: Likewise.
+	* include/parallel/algobase.h: Likewise.
+	* include/parallel/algo.h: Likewise.
+
 2008-01-14  Seongbae Park <seongbae.park@gmail.com>
 
 	* crossconfig.m4: Add missing header checks, C99 TR1 check,
diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h
index 47f305dca32..f1c40323413 100644
--- a/libstdc++-v3/include/parallel/algo.h
+++ b/libstdc++-v3/include/parallel/algo.h
@@ -1585,7 +1585,7 @@ namespace __parallel
 
   // Parallel algorithm for random access iterators.
   template<typename RandomAccessIterator, typename Size, typename Generator>
-    RandomAccessIterator
+    inline RandomAccessIterator
     generate_n_switch(RandomAccessIterator begin, Size n, Generator gen, 
 		      random_access_iterator_tag, 
 		      __gnu_parallel::parallelism parallelism_tag
@@ -1940,10 +1940,10 @@ namespace __parallel
 
   // Sequential fallback
   template<typename RandomAccessIterator>
-  void
-  partial_sort(RandomAccessIterator begin, RandomAccessIterator middle, 
-	       RandomAccessIterator end, __gnu_parallel::sequential_tag)
-  { _GLIBCXX_STD_P::partial_sort(begin, middle, end); }
+    inline void
+    partial_sort(RandomAccessIterator begin, RandomAccessIterator middle, 
+		 RandomAccessIterator end, __gnu_parallel::sequential_tag)
+    { _GLIBCXX_STD_P::partial_sort(begin, middle, end); }
 
   // Public interface, parallel algorithm for random access iterators
   template<typename RandomAccessIterator, typename _Compare>
@@ -2155,4 +2155,3 @@ namespace __parallel
 } // end namespace
 
 #endif /* _GLIBCXX_ALGORITHM_H */
-
diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h
index 4b3e6eba559..821985d49b1 100644
--- a/libstdc++-v3/include/parallel/algobase.h
+++ b/libstdc++-v3/include/parallel/algobase.h
@@ -58,7 +58,7 @@ namespace __parallel
   // Sequential fallback
   template<typename InputIterator1, typename InputIterator2>
     inline pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2, 
+    mismatch(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2,
 	     __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::mismatch(begin1, end1, begin2); }
 
@@ -66,7 +66,7 @@ namespace __parallel
   template<typename InputIterator1, typename InputIterator2,
 	   typename Predicate>
     inline pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2, 
+    mismatch(InputIterator1 begin1, InputIterator1 end1, InputIterator2 begin2,
 	     Predicate pred, __gnu_parallel::sequential_tag)
     { return _GLIBCXX_STD_P::mismatch(begin1, end1, begin2, pred); }
 
@@ -83,7 +83,7 @@ namespace __parallel
   template<typename RandomAccessIterator1, typename RandomAccessIterator2,
 	   typename Predicate>
     pair<RandomAccessIterator1, RandomAccessIterator2>
-    mismatch_switch(RandomAccessIterator1 begin1, RandomAccessIterator1 end1, 
+    mismatch_switch(RandomAccessIterator1 begin1, RandomAccessIterator1 end1,
 		    RandomAccessIterator2 begin2, Predicate pred, 
 		    random_access_iterator_tag, random_access_iterator_tag)
     {
diff --git a/libstdc++-v3/include/parallel/balanced_quicksort.h b/libstdc++-v3/include/parallel/balanced_quicksort.h
index 70d811526fd..182c82df602 100644
--- a/libstdc++-v3/include/parallel/balanced_quicksort.h
+++ b/libstdc++-v3/include/parallel/balanced_quicksort.h
@@ -307,10 +307,10 @@ template<typename RandomAccessIterator, typename Comparator>
                 // Very unequal split, one part smaller than one 128th
                 // elements not strictly larger than the pivot.
                 __gnu_parallel::unary_negate<__gnu_parallel::binder1st
-                    <Comparator, value_type, value_type, bool>, value_type>
-                    pred(__gnu_parallel::binder1st
-                        <Comparator, value_type, value_type, bool>(comp,
-								   *pivot_pos));
+		  <Comparator, value_type, value_type, bool>, value_type>
+		  pred(__gnu_parallel::binder1st
+		       <Comparator, value_type, value_type, bool>(comp,
+								  *pivot_pos));
 
                 // Find other end of pivot-equal range.
                 split_pos2 = __gnu_sequential::partition(split_pos1 + 1,
@@ -330,7 +330,8 @@ template<typename RandomAccessIterator, typename Comparator>
               {
                 // Right side larger.
                 if ((split_pos2) != end)
-                  tl.leftover_parts.push_front(std::make_pair(split_pos2, end));
+                  tl.leftover_parts.push_front(std::make_pair(split_pos2,
+							      end));
 
                 //current.first = begin;	//already set anyway
                 current.second = split_pos1;
diff --git a/libstdc++-v3/include/parallel/list_partition.h b/libstdc++-v3/include/parallel/list_partition.h
index 0fcc6285c71..5adc5c9280d 100644
--- a/libstdc++-v3/include/parallel/list_partition.h
+++ b/libstdc++-v3/include/parallel/list_partition.h
@@ -109,7 +109,7 @@ namespace __gnu_parallel
     {
       bool make_twice = false;
 
-      // According to the oversampling factor, the resizing algorithm is chosen.
+      // The resizing algorithm is chosen according to the oversampling factor.
       if (oversampling == 0)
 	{
 	  make_twice = true;
diff --git a/libstdc++-v3/include/parallel/numeric b/libstdc++-v3/include/parallel/numeric
index ccbdeee12c4..27bad63d3e5 100644
--- a/libstdc++-v3/include/parallel/numeric
+++ b/libstdc++-v3/include/parallel/numeric
@@ -78,7 +78,7 @@ namespace __parallel
 
   template<typename InputIterator, typename T, typename BinaryOperation,
 	   typename IteratorTag>
-    T
+    inline T
     accumulate_switch(InputIterator begin, InputIterator end, T init, 
 		      BinaryOperation binary_op, IteratorTag)
     { return accumulate(begin, end, init, binary_op, 
@@ -345,10 +345,9 @@ namespace __parallel
 		       OutputIterator result, BinaryOperation bin_op,
 		       random_access_iterator_tag, random_access_iterator_tag)
     {
-      if (_GLIBCXX_PARALLEL_CONDITION(static_cast<__gnu_parallel::
-				      sequence_index_t>(end - begin)
-				      >= __gnu_parallel::Settings::
-				      partial_sum_minimal_n))
+      if (_GLIBCXX_PARALLEL_CONDITION(
+	    static_cast<__gnu_parallel::sequence_index_t>(end - begin)
+	    >= __gnu_parallel::Settings::partial_sum_minimal_n))
 	return __gnu_parallel::parallel_partial_sum(begin, end,
 						    result, bin_op);
       else
diff --git a/libstdc++-v3/include/parallel/unique_copy.h b/libstdc++-v3/include/parallel/unique_copy.h
index 01bd1077c1b..7f51e2603fd 100644
--- a/libstdc++-v3/include/parallel/unique_copy.h
+++ b/libstdc++-v3/include/parallel/unique_copy.h
@@ -187,7 +187,8 @@ template<typename InputIterator, class OutputIterator>
   parallel_unique_copy(InputIterator first, InputIterator last,
                        OutputIterator result)
   {
-    typedef typename std::iterator_traits<InputIterator>::value_type value_type;
+    typedef typename std::iterator_traits<InputIterator>::value_type
+      value_type;
     return parallel_unique_copy(first, last, result,
 				std::equal_to<value_type>());
   }