find_selectors.h: Correct name for include guard #ifndef.

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)

From-SVN: r137827

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dc9437e5a945a405c5f2df429e0145056e5fdf4b..0aad1ec7536178d1eb00f2a7e0698ee64d332127 100644 (file)
--- 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 4aa4d8af47f6d1d56e113c3ea088134f872eb6c5..23e7bdcbabce7a7aff606d8aa56d695212602586 100644 (file)
--- 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 821985d49b17660020b6ccc5aaf5ea7463fde8d2..4e77dd7d5dc359b6cce78256c6790b9984acc5fa 100644 (file)
--- 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 ea6b245eb7e2b2a1ac29c76d2d0c7583e21799c3..3f386a5cdbc696b5a4f70ff9fe02f9f6a1e1d337 100644 (file)
--- 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 3393655fc985b3c371ae2e6fde2b21164c652bf1..3fd12642eeaa07c9b3824a537cb4ff467fca60e6 100644 (file)
--- 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 54c26d8ca6d58d2bf1c66545d9d27555abd0f754..45c3327f5af807a07de954da55461c65a1bdfc67 100644 (file)
--- 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 4b891be80b249ea3fd8ee0c23d0d48a09c5c78d0..edbecca7a9f3e3532ed406d1c8fa274dd4d3d573 100644 (file)
--- 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 1c6bc355d175c38b1585c8fb4bb17001f43862d2..231cea8892bff4f7f3c7c68014b62a4f451cfd8a 100644 (file)
--- 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 18514e6f8a989d935176dd6487eba76ae9007110..840a92017121d638df9de0090445fe0626985afb 100644 (file)
--- 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 37e458167278b6339471b1b1c1541a67c805d533..e12cb10a040efc9819133f2d9d745a5d6b3402b4 100644 (file)
--- 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 7150c20affcd9c620f94ec77fda36d00fac4aec4..f0aef51622ee92a2e335fcf249ff7d079f4ccc64 100644 (file)
--- 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 3e0084f68ab6ea08fa8cd77a8cbe98dbf829acc4..4717c8e570b1d17ab2e0316ecd458cc867101041 100644 (file)
--- 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 3076bd2327e4236aa95d521a0984dce912a90d8a..29c6ca09e9876def955da05d8bb16ac80a2cde38 100644 (file)
--- 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 8a4d702d2d548a18525752780b95765a99e7ddc0..df9d4f338a1a03786f527241eb0d5b0cdca9cf37 100644 (file)
--- 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 eaa55fc05c60e3f36a777ae4d1521138b5e83865..651b76bad28664e97a8cbe6a8e3321bfe6e555ce 100644 (file)
--- 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 ba20a460d5c9b30ba82212a862e878772415d898..7aaafee8611d2ec07ed8c15044860f598cbaeb33 100644 (file)
--- 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 5adc5c9280deb7692b9456e3f6b6bf13681ac3e9..c9d34e3c8e7888140330de5815b755332989bfd3 100644 (file)
--- 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 3736b908557e418a14c630bae27433d5a1ffde90..b7f8da036ae53a30ba2eea5133fb9edc7e2bf096 100644 (file)
--- 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 580b1479329e14fbab6808a5c2141b994c903b9a..ca140a5b12530a49bafc39de95a510656b23a755 100644 (file)
--- 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 662204526c9eb545ecca2247c8ba676f3c802420..ee9214f4a22d19febb51469c04bb8e29e84077f5 100644 (file)
--- 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 3c75c70f3c4eb60b64bd8ea2f920883fe472a79e..4bfad0c9989a947586d25aa5754ea3590e3d2bbc 100644 (file)
--- 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 9d9733ad05f5f7c3c8bc41492ab5575f5cdadd3b..c12e58407fd71d6f7517c1027fc8156e11d36f22 100644 (file)
--- 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 581ceaad6f4678f702df5a733d49f3fd20528336..362725b4a67b5402f94d30ad3c0a6f9914e791d2 100644 (file)
--- 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 bc34aed285756991013308344cd15efb88014e23..88634c95d4f20e586046abe40e2dbe5a61466665 100644 (file)
--- 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 96692e8645a0ad202fa7b0298c78cfe8d7e9c657..dc6c24975b51a554f5fca2cf41599547b1ee56fe 100644 (file)
--- 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 9e6c2ea641eaa59d18b2cbc8383908a4a35c107a..c8d2a220ca847a9305ebe6fae843317b8706df83 100644 (file)
--- 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 63246126b8f03b9316e5374bdc3a55034e5d2aa8..f76f67976b609cef5b0ef02870518763d5704e12 100644 (file)
--- 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 fd4954d456dab1e357988fd5898328ad7eb62e40..4551e48e97ba45bc27446455389744d6bc9af3fa 100644 (file)
--- 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 7747b7e9980041cb2657fd5a2f3b31e9d0ef22c8..f7bf3d083c9bd20e8bd01f46f2aeb6eb8446bd26 100644 (file)
--- 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 27a26f3ecaa5a46a42277148c8dd06e2cb04e41a..fc37f6c8a7190695849be31a34b336f08e6ad6e8 100644 (file)
--- 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 844a5bf3ccd6ce3388679060574429a4b4e2cff4..b0201c2c08b59597c031c8d74b1ec70b04ddad23 100644 (file)
--- 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 e1e11a8675c7cd699df42fc024387d86c58fe210..fa91198a9902f0d2ca0138c9111ea193c6396e12 100644 (file)
--- 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 e5bc5395c0bb5374acf50e5b8ad0b5eeb90f28e3..e6ce95d489deeb989df14f84330dc521a647aeea 100644 (file)
--- 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 86bd2b827b9bfcceadbaf6471b17dd446312a91b..acda6a858b5c7a621a24864950ddd5e9a9c2dfbe 100644 (file)
--- 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 dccfbd8326235c6236ccfce9b1cc641f256ed4c1..1d747401f8e37c1746dea77899b521a178850c08 100644 (file)
--- 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 ae1ae5ca063174e9d588a61b67add392b8e59a46..bf7bfdcfb8b014c65514192999a67b4fe5ae0133 100644 (file)
--- 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 559ed1cc19e1382d5413a32fade752bd12ea9ee9..6e786819b298dc1830ed827ce1ecbce40aa44b50 100644 (file)
--- 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 1b646b02084e82d7bdcd1b769b74cb44bbb1856a..40afa8a8580d2500ce25ec3a70e321f2b7446777 100644 (file)
--- 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 7f51e2603fde2a2af1977ae6af10d333a2e1772d..1ef379d1186813095ec6058d09d167b7f7b313a8 100644 (file)
--- 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 628f12cca2cb47c381c3af74ae8febbd014221f3..c8d571b0d6c622575320bc8d3996a46266ffbb80 100644 (file)
--- 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 */