This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH][libstdc++-v3 parallel mode] Cosmetic patch for include guards
- From: Johannes Singler <singler at ira dot uka dot de>
- To: libstdc++ <libstdc++ at gcc dot gnu dot org>, gcc-patches at gcc dot gnu dot org
- Date: Tue, 15 Jul 2008 11:41:13 +0200
- Subject: [PATCH][libstdc++-v3 parallel mode] Cosmetic patch for include guards
Cosmetic patch.
Tested x86_64-unknown-linux-gnu: No regressions
Please approve for mainline and gcc-4_3-branch.
2008-07-11 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)
Johannes
Index: include/parallel/iterator.h
===================================================================
--- include/parallel/iterator.h (revision 137692)
+++ include/parallel/iterator.h (working copy)
@@ -202,4 +202,4 @@
};
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_ITERATOR_H */
Index: include/parallel/multiway_merge.h
===================================================================
--- include/parallel/multiway_merge.h (revision 137692)
+++ include/parallel/multiway_merge.h (working copy)
@@ -2148,4 +2148,4 @@
}; // namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGE_H */
Index: include/parallel/parallel.h
===================================================================
--- include/parallel/parallel.h (revision 137692)
+++ include/parallel/parallel.h (working copy)
@@ -45,4 +45,4 @@
#include <parallel/tags.h>
#include <parallel/settings.h>
-#endif
+#endif /* _GLIBCXX_PARALLEL_PARALLEL_H */
Index: include/parallel/find_selectors.h
===================================================================
--- include/parallel/find_selectors.h (revision 137692)
+++ include/parallel/find_selectors.h (working copy)
@@ -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 @@
};
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_FIND_SELECTORS_H */
Index: include/parallel/losertree.h
===================================================================
--- include/parallel/losertree.h (revision 137692)
+++ include/parallel/losertree.h (working copy)
@@ -1024,4 +1024,4 @@
} // namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_LOSERTREE_H */
Index: include/parallel/list_partition.h
===================================================================
--- include/parallel/list_partition.h (revision 137692)
+++ include/parallel/list_partition.h (working copy)
@@ -179,4 +179,4 @@
}
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_LIST_PARTITION_H */
Index: include/parallel/types.h
===================================================================
--- include/parallel/types.h (revision 137692)
+++ include/parallel/types.h (working copy)
@@ -158,4 +158,4 @@
static const lcas_t lcas_t_mask = ((lcas_t(1) << (lcas_t_bits / 2)) - 1);
}
-#endif /* _GLIBCXX_TYPES_H */
+#endif /* _GLIBCXX_PARALLEL_TYPES_H */
Index: include/parallel/for_each.h
===================================================================
--- include/parallel/for_each.h (revision 137692)
+++ include/parallel/for_each.h (working copy)
@@ -100,4 +100,4 @@
}
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_FOR_EACH_H */
Index: include/parallel/multiseq_selection.h
===================================================================
--- include/parallel/multiseq_selection.h (revision 137692)
+++ include/parallel/multiseq_selection.h (working copy)
@@ -636,5 +636,4 @@
#undef S
-#endif
-
+#endif /* _GLIBCXX_PARALLEL_MULTISEQ_SELECTION_H */
Index: include/parallel/workstealing.h
===================================================================
--- include/parallel/workstealing.h (revision 137692)
+++ include/parallel/workstealing.h (working copy)
@@ -309,4 +309,4 @@
}
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_WORKSTEALING_H */
Index: include/parallel/base.h
===================================================================
--- include/parallel/base.h (revision 137692)
+++ include/parallel/base.h (working copy)
@@ -492,4 +492,4 @@
} //namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_BASE_H */
Index: include/parallel/par_loop.h
===================================================================
--- include/parallel/par_loop.h (revision 137692)
+++ include/parallel/par_loop.h (working copy)
@@ -128,4 +128,4 @@
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_PAR_LOOP_H */
Index: include/parallel/features.h
===================================================================
--- include/parallel/features.h (revision 137692)
+++ include/parallel/features.h (working copy)
@@ -107,4 +107,4 @@
#endif
-#endif
+#endif /* _GLIBCXX_PARALLEL_FEATURES_H */
Index: include/parallel/quicksort.h
===================================================================
--- include/parallel/quicksort.h (revision 137692)
+++ include/parallel/quicksort.h (working copy)
@@ -182,4 +182,4 @@
} //namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_QUICKSORT_H */
Index: include/parallel/equally_split.h
===================================================================
--- include/parallel/equally_split.h (revision 137692)
+++ include/parallel/equally_split.h (working copy)
@@ -90,4 +90,4 @@
}
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_EQUALLY_SPLIT_H */
Index: include/parallel/algorithmfwd.h
===================================================================
--- include/parallel/algorithmfwd.h (revision 137692)
+++ include/parallel/algorithmfwd.h (working copy)
@@ -892,4 +892,4 @@
} // end namespace __parallel
} // end namespace std
-#endif
+#endif /* _GLIBCXX_PARALLEL_ALGORITHMFWD_H */
Index: include/parallel/for_each_selectors.h
===================================================================
--- include/parallel/for_each_selectors.h (revision 137692)
+++ include/parallel/for_each_selectors.h (working copy)
@@ -363,4 +363,4 @@
};
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_FOR_EACH_SELECTORS_H */
Index: include/parallel/basic_iterator.h
===================================================================
--- include/parallel/basic_iterator.h (revision 137692)
+++ include/parallel/basic_iterator.h (working copy)
@@ -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 */
Index: include/parallel/omp_loop_static.h
===================================================================
--- include/parallel/omp_loop_static.h (revision 137692)
+++ include/parallel/omp_loop_static.h (working copy)
@@ -120,4 +120,4 @@
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_OMP_LOOP_STATIC_H */
Index: include/parallel/random_shuffle.h
===================================================================
--- include/parallel/random_shuffle.h (revision 137692)
+++ include/parallel/random_shuffle.h (working copy)
@@ -522,4 +522,4 @@
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_RANDOM_SHUFFLE_H */
Index: include/parallel/balanced_quicksort.h
===================================================================
--- include/parallel/balanced_quicksort.h (revision 137692)
+++ include/parallel/balanced_quicksort.h (working copy)
@@ -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 @@
}
} // namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H */
Index: include/parallel/set_operations.h
===================================================================
--- include/parallel/set_operations.h (revision 137692)
+++ include/parallel/set_operations.h (working copy)
@@ -527,4 +527,4 @@
}
-#endif // _GLIBCXX_SET_ALGORITHM_
+#endif /* _GLIBCXX_PARALLEL_SET_OPERATIONS_H */
Index: include/parallel/merge.h
===================================================================
--- include/parallel/merge.h (revision 137692)
+++ include/parallel/merge.h (working copy)
@@ -264,4 +264,4 @@
}
} //namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_MERGE_H */
Index: include/parallel/unique_copy.h
===================================================================
--- include/parallel/unique_copy.h (revision 137692)
+++ include/parallel/unique_copy.h (working copy)
@@ -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 @@
}//namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_UNIQUE_COPY_H */
Index: include/parallel/settings.h
===================================================================
--- include/parallel/settings.h (revision 137692)
+++ include/parallel/settings.h (working copy)
@@ -284,4 +284,4 @@
};
}
-#endif /* _GLIBCXX_SETTINGS_H */
+#endif /* _GLIBCXX_PARALLEL_SETTINGS_H */
Index: include/parallel/multiway_mergesort.h
===================================================================
--- include/parallel/multiway_mergesort.h (revision 137692)
+++ include/parallel/multiway_mergesort.h (working copy)
@@ -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 @@
}
} //namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H */
Index: include/parallel/numericfwd.h
===================================================================
--- include/parallel/numericfwd.h (revision 137692)
+++ include/parallel/numericfwd.h (working copy)
@@ -203,4 +203,4 @@
} // end namespace
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_NUMERICFWD_H */
Index: include/parallel/search.h
===================================================================
--- include/parallel/search.h (revision 137692)
+++ include/parallel/search.h (working copy)
@@ -175,4 +175,4 @@
}
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_SEARCH_H */
Index: include/parallel/partition.h
===================================================================
--- include/parallel/partition.h (revision 137692)
+++ include/parallel/partition.h (working copy)
@@ -432,4 +432,4 @@
#undef _GLIBCXX_VOLATILE
-#endif
+#endif /* _GLIBCXX_PARALLEL_PARTITION_H */
Index: include/parallel/compatibility.h
===================================================================
--- include/parallel/compatibility.h (revision 137692)
+++ include/parallel/compatibility.h (working copy)
@@ -353,4 +353,4 @@
}
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_COMPATIBILITY_H */
Index: include/parallel/algobase.h
===================================================================
--- include/parallel/algobase.h (revision 137692)
+++ include/parallel/algobase.h (working copy)
@@ -284,4 +284,4 @@
} // end namespace
} // end namespace
-#endif /* _GLIBCXX_ALGOBASE_H */
+#endif /* _GLIBCXX_PARALLEL_ALGOBASE_H */
Index: include/parallel/partial_sum.h
===================================================================
--- include/parallel/partial_sum.h (revision 137692)
+++ include/parallel/partial_sum.h (working copy)
@@ -223,4 +223,4 @@
}
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_PARTIAL_SUM_H */
Index: include/parallel/find.h
===================================================================
--- include/parallel/find.h (revision 137692)
+++ include/parallel/find.h (working copy)
@@ -404,4 +404,4 @@
#endif
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_FIND_H */
Index: include/parallel/algo.h
===================================================================
--- include/parallel/algo.h (revision 137692)
+++ include/parallel/algo.h (working copy)
@@ -2367,4 +2367,4 @@
} // end namespace
} // end namespace
-#endif /* _GLIBCXX_ALGORITHM_H */
+#endif /* _GLIBCXX_PARALLEL_ALGO_H */
Index: include/parallel/queue.h
===================================================================
--- include/parallel/queue.h (revision 137692)
+++ include/parallel/queue.h (working copy)
@@ -152,4 +152,4 @@
#undef _GLIBCXX_VOLATILE
-#endif
+#endif /* _GLIBCXX_PARALLEL_QUEUE_H */
Index: include/parallel/omp_loop.h
===================================================================
--- include/parallel/omp_loop.h (revision 137692)
+++ include/parallel/omp_loop.h (working copy)
@@ -121,4 +121,4 @@
} // end namespace
-#endif
+#endif /* _GLIBCXX_PARALLEL_OMP_LOOP_H */
Index: include/parallel/checkers.h
===================================================================
--- include/parallel/checkers.h (revision 137692)
+++ include/parallel/checkers.h (working copy)
@@ -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 @@
}
}
-#endif
+#endif /* _GLIBCXX_PARALLEL_CHECKERS_H */
Index: include/parallel/sort.h
===================================================================
--- include/parallel/sort.h (revision 137692)
+++ include/parallel/sort.h (working copy)
@@ -232,4 +232,4 @@
}
} // end namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_SORT_H */
Index: include/parallel/random_number.h
===================================================================
--- include/parallel/random_number.h (revision 137692)
+++ include/parallel/random_number.h (working copy)
@@ -127,4 +127,4 @@
} // namespace __gnu_parallel
-#endif
+#endif /* _GLIBCXX_PARALLEL_RANDOM_NUMBER_H */