2008-07-15 Johannes Singler <singler@ira.uka.de>

        * include/parallel/find_selectors.h:
        Correct name for include guard #ifndef.
        * include/parallel/balanced_quicksort.h: Likewise.
        * include/parallel/unique_copy.h: Likewise.
        * include/parallel/multiway_mergesort.h: Likewise.
        * include/parallel/checkers.h: Likewise.
        * include/parallel/[various files]:
        Add/correct comment for #endif of include guard (at end of file) 



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

40 files changed, 60 insertions, 50 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dc9437e5a94..0aad1ec7536 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-15  Johannes Singler  <singler@ira.uka.de>
+
+        * include/parallel/find_selectors.h:
+        Correct name for include guard #ifndef.
+        * include/parallel/balanced_quicksort.h: Likewise.
+        * include/parallel/unique_copy.h: Likewise.
+        * include/parallel/multiway_mergesort.h: Likewise.
+        * include/parallel/checkers.h: Likewise.
+        * include/parallel/[various files]:
+        Add/correct comment for #endif of include guard (at end of file) 
+
 2008-07-12  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/std/date_time: Remove, per N2549, in WP.
diff --git a/libstdc++-v3/include/parallel/algo.h b/libstdc++-v3/include/parallel/algo.h
index 4aa4d8af47f..23e7bdcbabc 100644
--- a/libstdc++-v3/include/parallel/algo.h
+++ b/libstdc++-v3/include/parallel/algo.h
@@ -2367,4 +2367,4 @@ namespace __parallel
 } // end namespace
 } // end namespace
 
-#endif /* _GLIBCXX_ALGORITHM_H */
+#endif /* _GLIBCXX_PARALLEL_ALGO_H */
diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h
index 821985d49b1..4e77dd7d5dc 100644
--- a/libstdc++-v3/include/parallel/algobase.h
+++ b/libstdc++-v3/include/parallel/algobase.h
@@ -284,4 +284,4 @@ namespace __parallel
 } // end namespace
 } // end namespace
 
-#endif /* _GLIBCXX_ALGOBASE_H */
+#endif /* _GLIBCXX_PARALLEL_ALGOBASE_H */
diff --git a/libstdc++-v3/include/parallel/algorithmfwd.h b/libstdc++-v3/include/parallel/algorithmfwd.h
index ea6b245eb7e..3f386a5cdbc 100644
--- a/libstdc++-v3/include/parallel/algorithmfwd.h
+++ b/libstdc++-v3/include/parallel/algorithmfwd.h
@@ -892,4 +892,4 @@ namespace __parallel
 } // end namespace __parallel
 } // end namespace std
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_ALGORITHMFWD_H */
diff --git a/libstdc++-v3/include/parallel/balanced_quicksort.h b/libstdc++-v3/include/parallel/balanced_quicksort.h
index 3393655fc98..3fd12642eea 100644
--- a/libstdc++-v3/include/parallel/balanced_quicksort.h
+++ b/libstdc++-v3/include/parallel/balanced_quicksort.h
@@ -45,8 +45,8 @@
 
 // Written by Johannes Singler.
 
-#ifndef _GLIBCXX_PARALLEL_BAL_QUICKSORT_H
-#define _GLIBCXX_PARALLEL_BAL_QUICKSORT_H 1
+#ifndef _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H
+#define _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H 1
 
 #include <parallel/basic_iterator.h>
 #include <bits/stl_algo.h>
@@ -480,4 +480,4 @@ template<typename RandomAccessIterator, typename Comparator>
   }
 } // namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H */
diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h
index 54c26d8ca6d..45c3327f5af 100644
--- a/libstdc++-v3/include/parallel/base.h
+++ b/libstdc++-v3/include/parallel/base.h
@@ -492,4 +492,4 @@ do 								        \
 
 } //namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_BASE_H */
diff --git a/libstdc++-v3/include/parallel/basic_iterator.h b/libstdc++-v3/include/parallel/basic_iterator.h
index 4b891be80b2..edbecca7a9f 100644
--- a/libstdc++-v3/include/parallel/basic_iterator.h
+++ b/libstdc++-v3/include/parallel/basic_iterator.h
@@ -45,4 +45,4 @@
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/stl_iterator.h>
 
-#endif /* _GLIBCXX_BASIC_ITERATOR_H */
+#endif /* _GLIBCXX_PARALLEL_BASIC_ITERATOR_H */
diff --git a/libstdc++-v3/include/parallel/checkers.h b/libstdc++-v3/include/parallel/checkers.h
index 1c6bc355d17..231cea8892b 100644
--- a/libstdc++-v3/include/parallel/checkers.h
+++ b/libstdc++-v3/include/parallel/checkers.h
@@ -35,8 +35,8 @@
 
 // Written by Johannes Singler.
 
-#ifndef _GLIBCXX_PARALLEL_CHECKERS
-#define _GLIBCXX_PARALLEL_CHECKERS 1
+#ifndef _GLIBCXX_PARALLEL_CHECKERS_H
+#define _GLIBCXX_PARALLEL_CHECKERS_H 1
 
 #include <functional>
 #include <cstdio>
@@ -157,4 +157,4 @@ namespace __gnu_parallel
     }
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_CHECKERS_H */
diff --git a/libstdc++-v3/include/parallel/compatibility.h b/libstdc++-v3/include/parallel/compatibility.h
index 18514e6f8a9..840a9201712 100644
--- a/libstdc++-v3/include/parallel/compatibility.h
+++ b/libstdc++-v3/include/parallel/compatibility.h
@@ -353,4 +353,4 @@ namespace __gnu_parallel
   }
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_COMPATIBILITY_H */
diff --git a/libstdc++-v3/include/parallel/equally_split.h b/libstdc++-v3/include/parallel/equally_split.h
index 37e45816727..e12cb10a040 100644
--- a/libstdc++-v3/include/parallel/equally_split.h
+++ b/libstdc++-v3/include/parallel/equally_split.h
@@ -90,4 +90,4 @@ template<typename difference_type>
   }
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_EQUALLY_SPLIT_H */
diff --git a/libstdc++-v3/include/parallel/features.h b/libstdc++-v3/include/parallel/features.h
index 7150c20affc..f0aef51622e 100644
--- a/libstdc++-v3/include/parallel/features.h
+++ b/libstdc++-v3/include/parallel/features.h
@@ -107,4 +107,4 @@
 #endif
 
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_FEATURES_H */
diff --git a/libstdc++-v3/include/parallel/find.h b/libstdc++-v3/include/parallel/find.h
index 3e0084f68ab..4717c8e570b 100644
--- a/libstdc++-v3/include/parallel/find.h
+++ b/libstdc++-v3/include/parallel/find.h
@@ -404,4 +404,4 @@ template<typename RandomAccessIterator1,
 #endif
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_FIND_H */
diff --git a/libstdc++-v3/include/parallel/find_selectors.h b/libstdc++-v3/include/parallel/find_selectors.h
index 3076bd2327e..29c6ca09e98 100644
--- a/libstdc++-v3/include/parallel/find_selectors.h
+++ b/libstdc++-v3/include/parallel/find_selectors.h
@@ -36,8 +36,8 @@
 
 // Written by Felix Putze.
 
-#ifndef _GLIBCXX_PARALLEL_FIND_FUNCTIONS_H
-#define _GLIBCXX_PARALLEL_FIND_FUNCTIONS_H 1
+#ifndef _GLIBCXX_PARALLEL_FIND_SELECTORS_H
+#define _GLIBCXX_PARALLEL_FIND_SELECTORS_H 1
 
 #include <parallel/tags.h>
 #include <parallel/basic_iterator.h>
@@ -195,4 +195,4 @@ namespace __gnu_parallel
   };
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_FIND_SELECTORS_H */
diff --git a/libstdc++-v3/include/parallel/for_each.h b/libstdc++-v3/include/parallel/for_each.h
index 8a4d702d2d5..df9d4f338a1 100644
--- a/libstdc++-v3/include/parallel/for_each.h
+++ b/libstdc++-v3/include/parallel/for_each.h
@@ -100,4 +100,4 @@ namespace __gnu_parallel
   }
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_FOR_EACH_H */
diff --git a/libstdc++-v3/include/parallel/for_each_selectors.h b/libstdc++-v3/include/parallel/for_each_selectors.h
index eaa55fc05c6..651b76bad28 100644
--- a/libstdc++-v3/include/parallel/for_each_selectors.h
+++ b/libstdc++-v3/include/parallel/for_each_selectors.h
@@ -363,4 +363,4 @@ namespace __gnu_parallel
     };
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_FOR_EACH_SELECTORS_H */
diff --git a/libstdc++-v3/include/parallel/iterator.h b/libstdc++-v3/include/parallel/iterator.h
index ba20a460d5c..7aaafee8611 100644
--- a/libstdc++-v3/include/parallel/iterator.h
+++ b/libstdc++-v3/include/parallel/iterator.h
@@ -202,4 +202,4 @@ namespace __gnu_parallel
   };
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_ITERATOR_H */
diff --git a/libstdc++-v3/include/parallel/list_partition.h b/libstdc++-v3/include/parallel/list_partition.h
index 5adc5c9280d..c9d34e3c8e7 100644
--- a/libstdc++-v3/include/parallel/list_partition.h
+++ b/libstdc++-v3/include/parallel/list_partition.h
@@ -179,4 +179,4 @@ namespace __gnu_parallel
     }
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_LIST_PARTITION_H */
diff --git a/libstdc++-v3/include/parallel/losertree.h b/libstdc++-v3/include/parallel/losertree.h
index 3736b908557..b7f8da036ae 100644
--- a/libstdc++-v3/include/parallel/losertree.h
+++ b/libstdc++-v3/include/parallel/losertree.h
@@ -1024,4 +1024,4 @@ public:
 
 } // namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_LOSERTREE_H */
diff --git a/libstdc++-v3/include/parallel/merge.h b/libstdc++-v3/include/parallel/merge.h
index 580b1479329..ca140a5b125 100644
--- a/libstdc++-v3/include/parallel/merge.h
+++ b/libstdc++-v3/include/parallel/merge.h
@@ -264,4 +264,4 @@ namespace __gnu_parallel
     }
 }	//namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_MERGE_H */
diff --git a/libstdc++-v3/include/parallel/multiseq_selection.h b/libstdc++-v3/include/parallel/multiseq_selection.h
index 662204526c9..ee9214f4a22 100644
--- a/libstdc++-v3/include/parallel/multiseq_selection.h
+++ b/libstdc++-v3/include/parallel/multiseq_selection.h
@@ -636,5 +636,4 @@ namespace __gnu_parallel
 
 #undef S
 
-#endif
-
+#endif /* _GLIBCXX_PARALLEL_MULTISEQ_SELECTION_H */
diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h
index 3c75c70f3c4..4bfad0c9989 100644
--- a/libstdc++-v3/include/parallel/multiway_merge.h
+++ b/libstdc++-v3/include/parallel/multiway_merge.h
@@ -2148,4 +2148,4 @@ stable_multiway_merge_sentinels(RandomAccessIteratorPairIterator seqs_begin
 
 }; // namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGE_H */
diff --git a/libstdc++-v3/include/parallel/multiway_mergesort.h b/libstdc++-v3/include/parallel/multiway_mergesort.h
index 9d9733ad05f..c12e58407fd 100644
--- a/libstdc++-v3/include/parallel/multiway_mergesort.h
+++ b/libstdc++-v3/include/parallel/multiway_mergesort.h
@@ -35,8 +35,8 @@
 
 // Written by Johannes Singler.
 
-#ifndef _GLIBCXX_PARALLEL_MERGESORT_H
-#define _GLIBCXX_PARALLEL_MERGESORT_H 1
+#ifndef _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H
+#define _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H 1
 
 #include <vector>
 
@@ -478,4 +478,4 @@ template<bool stable, bool exact, typename RandomAccessIterator,
   }
 } //namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H */
diff --git a/libstdc++-v3/include/parallel/numericfwd.h b/libstdc++-v3/include/parallel/numericfwd.h
index 581ceaad6f4..362725b4a67 100644
--- a/libstdc++-v3/include/parallel/numericfwd.h
+++ b/libstdc++-v3/include/parallel/numericfwd.h
@@ -203,4 +203,4 @@ namespace __parallel
 } // end namespace
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_NUMERICFWD_H */
diff --git a/libstdc++-v3/include/parallel/omp_loop.h b/libstdc++-v3/include/parallel/omp_loop.h
index bc34aed2857..88634c95d4f 100644
--- a/libstdc++-v3/include/parallel/omp_loop.h
+++ b/libstdc++-v3/include/parallel/omp_loop.h
@@ -121,4 +121,4 @@ template<typename RandomAccessIterator,
 
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_OMP_LOOP_H */
diff --git a/libstdc++-v3/include/parallel/omp_loop_static.h b/libstdc++-v3/include/parallel/omp_loop_static.h
index 96692e8645a..dc6c24975b5 100644
--- a/libstdc++-v3/include/parallel/omp_loop_static.h
+++ b/libstdc++-v3/include/parallel/omp_loop_static.h
@@ -120,4 +120,4 @@ template<typename RandomAccessIterator,
 
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_OMP_LOOP_STATIC_H */
diff --git a/libstdc++-v3/include/parallel/par_loop.h b/libstdc++-v3/include/parallel/par_loop.h
index 9e6c2ea641e..c8d2a220ca8 100644
--- a/libstdc++-v3/include/parallel/par_loop.h
+++ b/libstdc++-v3/include/parallel/par_loop.h
@@ -128,4 +128,4 @@ template<typename RandomAccessIterator,
 
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_PAR_LOOP_H */
diff --git a/libstdc++-v3/include/parallel/parallel.h b/libstdc++-v3/include/parallel/parallel.h
index 63246126b8f..f76f67976b6 100644
--- a/libstdc++-v3/include/parallel/parallel.h
+++ b/libstdc++-v3/include/parallel/parallel.h
@@ -45,4 +45,4 @@
 #include <parallel/tags.h>
 #include <parallel/settings.h>
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_PARALLEL_H */
diff --git a/libstdc++-v3/include/parallel/partial_sum.h b/libstdc++-v3/include/parallel/partial_sum.h
index fd4954d456d..4551e48e97b 100644
--- a/libstdc++-v3/include/parallel/partial_sum.h
+++ b/libstdc++-v3/include/parallel/partial_sum.h
@@ -223,4 +223,4 @@ template<typename InputIterator,
   }
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_PARTIAL_SUM_H */
diff --git a/libstdc++-v3/include/parallel/partition.h b/libstdc++-v3/include/parallel/partition.h
index 7747b7e9980..f7bf3d083c9 100644
--- a/libstdc++-v3/include/parallel/partition.h
+++ b/libstdc++-v3/include/parallel/partition.h
@@ -432,4 +432,4 @@ template<typename RandomAccessIterator, typename Comparator>
 
 #undef _GLIBCXX_VOLATILE
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_PARTITION_H */
diff --git a/libstdc++-v3/include/parallel/queue.h b/libstdc++-v3/include/parallel/queue.h
index 27a26f3ecaa..fc37f6c8a71 100644
--- a/libstdc++-v3/include/parallel/queue.h
+++ b/libstdc++-v3/include/parallel/queue.h
@@ -152,4 +152,4 @@ namespace __gnu_parallel
 
 #undef _GLIBCXX_VOLATILE
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_QUEUE_H */
diff --git a/libstdc++-v3/include/parallel/quicksort.h b/libstdc++-v3/include/parallel/quicksort.h
index 844a5bf3ccd..b0201c2c08b 100644
--- a/libstdc++-v3/include/parallel/quicksort.h
+++ b/libstdc++-v3/include/parallel/quicksort.h
@@ -182,4 +182,4 @@ namespace __gnu_parallel
 
 } //namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_QUICKSORT_H */
diff --git a/libstdc++-v3/include/parallel/random_number.h b/libstdc++-v3/include/parallel/random_number.h
index e1e11a8675c..fa91198a990 100644
--- a/libstdc++-v3/include/parallel/random_number.h
+++ b/libstdc++-v3/include/parallel/random_number.h
@@ -127,4 +127,4 @@ namespace __gnu_parallel
 
 } // namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_RANDOM_NUMBER_H */
diff --git a/libstdc++-v3/include/parallel/random_shuffle.h b/libstdc++-v3/include/parallel/random_shuffle.h
index e5bc5395c0b..e6ce95d489d 100644
--- a/libstdc++-v3/include/parallel/random_shuffle.h
+++ b/libstdc++-v3/include/parallel/random_shuffle.h
@@ -522,4 +522,4 @@ template<typename RandomAccessIterator, typename RandomNumberGenerator>
 
 }
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_RANDOM_SHUFFLE_H */
diff --git a/libstdc++-v3/include/parallel/search.h b/libstdc++-v3/include/parallel/search.h
index 86bd2b827b9..acda6a858b5 100644
--- a/libstdc++-v3/include/parallel/search.h
+++ b/libstdc++-v3/include/parallel/search.h
@@ -175,4 +175,4 @@ template<typename _RandomAccessIterator1,
   }
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_SEARCH_H */
diff --git a/libstdc++-v3/include/parallel/set_operations.h b/libstdc++-v3/include/parallel/set_operations.h
index dccfbd83262..1d747401f8e 100644
--- a/libstdc++-v3/include/parallel/set_operations.h
+++ b/libstdc++-v3/include/parallel/set_operations.h
@@ -527,4 +527,4 @@ template<typename InputIterator,
 
 }
 
-#endif // _GLIBCXX_SET_ALGORITHM_
+#endif /* _GLIBCXX_PARALLEL_SET_OPERATIONS_H */
diff --git a/libstdc++-v3/include/parallel/settings.h b/libstdc++-v3/include/parallel/settings.h
index ae1ae5ca063..bf7bfdcfb8b 100644
--- a/libstdc++-v3/include/parallel/settings.h
+++ b/libstdc++-v3/include/parallel/settings.h
@@ -284,4 +284,4 @@ namespace __gnu_parallel
   };
 }
 
-#endif /* _GLIBCXX_SETTINGS_H */
+#endif /* _GLIBCXX_PARALLEL_SETTINGS_H */
diff --git a/libstdc++-v3/include/parallel/sort.h b/libstdc++-v3/include/parallel/sort.h
index 559ed1cc19e..6e786819b29 100644
--- a/libstdc++-v3/include/parallel/sort.h
+++ b/libstdc++-v3/include/parallel/sort.h
@@ -232,4 +232,4 @@ namespace __gnu_parallel
     }
 } // end namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_SORT_H */
diff --git a/libstdc++-v3/include/parallel/types.h b/libstdc++-v3/include/parallel/types.h
index 1b646b02084..40afa8a8580 100644
--- a/libstdc++-v3/include/parallel/types.h
+++ b/libstdc++-v3/include/parallel/types.h
@@ -158,4 +158,4 @@ namespace __gnu_parallel
   static const lcas_t lcas_t_mask = ((lcas_t(1) << (lcas_t_bits / 2)) - 1);
 }
 
-#endif /* _GLIBCXX_TYPES_H */
+#endif /* _GLIBCXX_PARALLEL_TYPES_H */
diff --git a/libstdc++-v3/include/parallel/unique_copy.h b/libstdc++-v3/include/parallel/unique_copy.h
index 7f51e2603fd..1ef379d1186 100644
--- a/libstdc++-v3/include/parallel/unique_copy.h
+++ b/libstdc++-v3/include/parallel/unique_copy.h
@@ -35,8 +35,8 @@
 
 // Written by Robert Geisberger and Robin Dapp.
 
-#ifndef _GLIBCXX_PARALLEL_UNIQUE_H
-#define _GLIBCXX_PARALLEL_UNIQUE_H 1
+#ifndef _GLIBCXX_PARALLEL_UNIQUE_COPY_H
+#define _GLIBCXX_PARALLEL_UNIQUE_COPY_H 1
 
 #include <parallel/parallel.h>
 #include <parallel/multiseq_selection.h>
@@ -195,4 +195,4 @@ template<typename InputIterator, class OutputIterator>
 
 }//namespace __gnu_parallel
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_UNIQUE_COPY_H */
diff --git a/libstdc++-v3/include/parallel/workstealing.h b/libstdc++-v3/include/parallel/workstealing.h
index 628f12cca2c..c8d571b0d6c 100644
--- a/libstdc++-v3/include/parallel/workstealing.h
+++ b/libstdc++-v3/include/parallel/workstealing.h
@@ -309,4 +309,4 @@ template<typename RandomAccessIterator,
   }
 } // end namespace
 
-#endif
+#endif /* _GLIBCXX_PARALLEL_WORKSTEALING_H */