Commit cbcd1e45 by Johannes Singler Committed by Johannes Singler

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
parent e65d1ec6
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> 2008-07-12 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/date_time: Remove, per N2549, in WP. * include/std/date_time: Remove, per N2549, in WP.
......
...@@ -2367,4 +2367,4 @@ namespace __parallel ...@@ -2367,4 +2367,4 @@ namespace __parallel
} // end namespace } // end namespace
} // end namespace } // end namespace
#endif /* _GLIBCXX_ALGORITHM_H */ #endif /* _GLIBCXX_PARALLEL_ALGO_H */
...@@ -284,4 +284,4 @@ namespace __parallel ...@@ -284,4 +284,4 @@ namespace __parallel
} // end namespace } // end namespace
} // end namespace } // end namespace
#endif /* _GLIBCXX_ALGOBASE_H */ #endif /* _GLIBCXX_PARALLEL_ALGOBASE_H */
...@@ -892,4 +892,4 @@ namespace __parallel ...@@ -892,4 +892,4 @@ namespace __parallel
} // end namespace __parallel } // end namespace __parallel
} // end namespace std } // end namespace std
#endif #endif /* _GLIBCXX_PARALLEL_ALGORITHMFWD_H */
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
// Written by Johannes Singler. // Written by Johannes Singler.
#ifndef _GLIBCXX_PARALLEL_BAL_QUICKSORT_H #ifndef _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H
#define _GLIBCXX_PARALLEL_BAL_QUICKSORT_H 1 #define _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H 1
#include <parallel/basic_iterator.h> #include <parallel/basic_iterator.h>
#include <bits/stl_algo.h> #include <bits/stl_algo.h>
...@@ -480,4 +480,4 @@ template<typename RandomAccessIterator, typename Comparator> ...@@ -480,4 +480,4 @@ template<typename RandomAccessIterator, typename Comparator>
} }
} // namespace __gnu_parallel } // namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_BALANCED_QUICKSORT_H */
...@@ -492,4 +492,4 @@ do \ ...@@ -492,4 +492,4 @@ do \
} //namespace __gnu_parallel } //namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_BASE_H */
...@@ -45,4 +45,4 @@ ...@@ -45,4 +45,4 @@
#include <bits/stl_iterator_base_funcs.h> #include <bits/stl_iterator_base_funcs.h>
#include <bits/stl_iterator.h> #include <bits/stl_iterator.h>
#endif /* _GLIBCXX_BASIC_ITERATOR_H */ #endif /* _GLIBCXX_PARALLEL_BASIC_ITERATOR_H */
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
// Written by Johannes Singler. // Written by Johannes Singler.
#ifndef _GLIBCXX_PARALLEL_CHECKERS #ifndef _GLIBCXX_PARALLEL_CHECKERS_H
#define _GLIBCXX_PARALLEL_CHECKERS 1 #define _GLIBCXX_PARALLEL_CHECKERS_H 1
#include <functional> #include <functional>
#include <cstdio> #include <cstdio>
...@@ -157,4 +157,4 @@ namespace __gnu_parallel ...@@ -157,4 +157,4 @@ namespace __gnu_parallel
} }
} }
#endif #endif /* _GLIBCXX_PARALLEL_CHECKERS_H */
...@@ -353,4 +353,4 @@ namespace __gnu_parallel ...@@ -353,4 +353,4 @@ namespace __gnu_parallel
} }
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_COMPATIBILITY_H */
...@@ -90,4 +90,4 @@ template<typename difference_type> ...@@ -90,4 +90,4 @@ template<typename difference_type>
} }
} }
#endif #endif /* _GLIBCXX_PARALLEL_EQUALLY_SPLIT_H */
...@@ -107,4 +107,4 @@ ...@@ -107,4 +107,4 @@
#endif #endif
#endif #endif /* _GLIBCXX_PARALLEL_FEATURES_H */
...@@ -404,4 +404,4 @@ template<typename RandomAccessIterator1, ...@@ -404,4 +404,4 @@ template<typename RandomAccessIterator1,
#endif #endif
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_FIND_H */
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
// Written by Felix Putze. // Written by Felix Putze.
#ifndef _GLIBCXX_PARALLEL_FIND_FUNCTIONS_H #ifndef _GLIBCXX_PARALLEL_FIND_SELECTORS_H
#define _GLIBCXX_PARALLEL_FIND_FUNCTIONS_H 1 #define _GLIBCXX_PARALLEL_FIND_SELECTORS_H 1
#include <parallel/tags.h> #include <parallel/tags.h>
#include <parallel/basic_iterator.h> #include <parallel/basic_iterator.h>
...@@ -195,4 +195,4 @@ namespace __gnu_parallel ...@@ -195,4 +195,4 @@ namespace __gnu_parallel
}; };
} }
#endif #endif /* _GLIBCXX_PARALLEL_FIND_SELECTORS_H */
...@@ -100,4 +100,4 @@ namespace __gnu_parallel ...@@ -100,4 +100,4 @@ namespace __gnu_parallel
} }
} }
#endif #endif /* _GLIBCXX_PARALLEL_FOR_EACH_H */
...@@ -363,4 +363,4 @@ namespace __gnu_parallel ...@@ -363,4 +363,4 @@ namespace __gnu_parallel
}; };
} }
#endif #endif /* _GLIBCXX_PARALLEL_FOR_EACH_SELECTORS_H */
...@@ -202,4 +202,4 @@ namespace __gnu_parallel ...@@ -202,4 +202,4 @@ namespace __gnu_parallel
}; };
} }
#endif #endif /* _GLIBCXX_PARALLEL_ITERATOR_H */
...@@ -179,4 +179,4 @@ namespace __gnu_parallel ...@@ -179,4 +179,4 @@ namespace __gnu_parallel
} }
} }
#endif #endif /* _GLIBCXX_PARALLEL_LIST_PARTITION_H */
...@@ -1024,4 +1024,4 @@ public: ...@@ -1024,4 +1024,4 @@ public:
} // namespace __gnu_parallel } // namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_LOSERTREE_H */
...@@ -264,4 +264,4 @@ namespace __gnu_parallel ...@@ -264,4 +264,4 @@ namespace __gnu_parallel
} }
} //namespace __gnu_parallel } //namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_MERGE_H */
...@@ -636,5 +636,4 @@ namespace __gnu_parallel ...@@ -636,5 +636,4 @@ namespace __gnu_parallel
#undef S #undef S
#endif #endif /* _GLIBCXX_PARALLEL_MULTISEQ_SELECTION_H */
...@@ -2148,4 +2148,4 @@ stable_multiway_merge_sentinels(RandomAccessIteratorPairIterator seqs_begin ...@@ -2148,4 +2148,4 @@ stable_multiway_merge_sentinels(RandomAccessIteratorPairIterator seqs_begin
}; // namespace __gnu_parallel }; // namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGE_H */
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
// Written by Johannes Singler. // Written by Johannes Singler.
#ifndef _GLIBCXX_PARALLEL_MERGESORT_H #ifndef _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H
#define _GLIBCXX_PARALLEL_MERGESORT_H 1 #define _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H 1
#include <vector> #include <vector>
...@@ -478,4 +478,4 @@ template<bool stable, bool exact, typename RandomAccessIterator, ...@@ -478,4 +478,4 @@ template<bool stable, bool exact, typename RandomAccessIterator,
} }
} //namespace __gnu_parallel } //namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_MULTIWAY_MERGESORT_H */
...@@ -203,4 +203,4 @@ namespace __parallel ...@@ -203,4 +203,4 @@ namespace __parallel
} // end namespace } // end namespace
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_NUMERICFWD_H */
...@@ -121,4 +121,4 @@ template<typename RandomAccessIterator, ...@@ -121,4 +121,4 @@ template<typename RandomAccessIterator,
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_OMP_LOOP_H */
...@@ -120,4 +120,4 @@ template<typename RandomAccessIterator, ...@@ -120,4 +120,4 @@ template<typename RandomAccessIterator,
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_OMP_LOOP_STATIC_H */
...@@ -128,4 +128,4 @@ template<typename RandomAccessIterator, ...@@ -128,4 +128,4 @@ template<typename RandomAccessIterator,
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_PAR_LOOP_H */
...@@ -45,4 +45,4 @@ ...@@ -45,4 +45,4 @@
#include <parallel/tags.h> #include <parallel/tags.h>
#include <parallel/settings.h> #include <parallel/settings.h>
#endif #endif /* _GLIBCXX_PARALLEL_PARALLEL_H */
...@@ -223,4 +223,4 @@ template<typename InputIterator, ...@@ -223,4 +223,4 @@ template<typename InputIterator,
} }
} }
#endif #endif /* _GLIBCXX_PARALLEL_PARTIAL_SUM_H */
...@@ -432,4 +432,4 @@ template<typename RandomAccessIterator, typename Comparator> ...@@ -432,4 +432,4 @@ template<typename RandomAccessIterator, typename Comparator>
#undef _GLIBCXX_VOLATILE #undef _GLIBCXX_VOLATILE
#endif #endif /* _GLIBCXX_PARALLEL_PARTITION_H */
...@@ -152,4 +152,4 @@ namespace __gnu_parallel ...@@ -152,4 +152,4 @@ namespace __gnu_parallel
#undef _GLIBCXX_VOLATILE #undef _GLIBCXX_VOLATILE
#endif #endif /* _GLIBCXX_PARALLEL_QUEUE_H */
...@@ -182,4 +182,4 @@ namespace __gnu_parallel ...@@ -182,4 +182,4 @@ namespace __gnu_parallel
} //namespace __gnu_parallel } //namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_QUICKSORT_H */
...@@ -127,4 +127,4 @@ namespace __gnu_parallel ...@@ -127,4 +127,4 @@ namespace __gnu_parallel
} // namespace __gnu_parallel } // namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_RANDOM_NUMBER_H */
...@@ -522,4 +522,4 @@ template<typename RandomAccessIterator, typename RandomNumberGenerator> ...@@ -522,4 +522,4 @@ template<typename RandomAccessIterator, typename RandomNumberGenerator>
} }
#endif #endif /* _GLIBCXX_PARALLEL_RANDOM_SHUFFLE_H */
...@@ -175,4 +175,4 @@ template<typename _RandomAccessIterator1, ...@@ -175,4 +175,4 @@ template<typename _RandomAccessIterator1,
} }
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_SEARCH_H */
...@@ -527,4 +527,4 @@ template<typename InputIterator, ...@@ -527,4 +527,4 @@ template<typename InputIterator,
} }
#endif // _GLIBCXX_SET_ALGORITHM_ #endif /* _GLIBCXX_PARALLEL_SET_OPERATIONS_H */
...@@ -284,4 +284,4 @@ namespace __gnu_parallel ...@@ -284,4 +284,4 @@ namespace __gnu_parallel
}; };
} }
#endif /* _GLIBCXX_SETTINGS_H */ #endif /* _GLIBCXX_PARALLEL_SETTINGS_H */
...@@ -232,4 +232,4 @@ namespace __gnu_parallel ...@@ -232,4 +232,4 @@ namespace __gnu_parallel
} }
} // end namespace __gnu_parallel } // end namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_SORT_H */
...@@ -158,4 +158,4 @@ namespace __gnu_parallel ...@@ -158,4 +158,4 @@ namespace __gnu_parallel
static const lcas_t lcas_t_mask = ((lcas_t(1) << (lcas_t_bits / 2)) - 1); static const lcas_t lcas_t_mask = ((lcas_t(1) << (lcas_t_bits / 2)) - 1);
} }
#endif /* _GLIBCXX_TYPES_H */ #endif /* _GLIBCXX_PARALLEL_TYPES_H */
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
// Written by Robert Geisberger and Robin Dapp. // Written by Robert Geisberger and Robin Dapp.
#ifndef _GLIBCXX_PARALLEL_UNIQUE_H #ifndef _GLIBCXX_PARALLEL_UNIQUE_COPY_H
#define _GLIBCXX_PARALLEL_UNIQUE_H 1 #define _GLIBCXX_PARALLEL_UNIQUE_COPY_H 1
#include <parallel/parallel.h> #include <parallel/parallel.h>
#include <parallel/multiseq_selection.h> #include <parallel/multiseq_selection.h>
...@@ -195,4 +195,4 @@ template<typename InputIterator, class OutputIterator> ...@@ -195,4 +195,4 @@ template<typename InputIterator, class OutputIterator>
}//namespace __gnu_parallel }//namespace __gnu_parallel
#endif #endif /* _GLIBCXX_PARALLEL_UNIQUE_COPY_H */
...@@ -309,4 +309,4 @@ template<typename RandomAccessIterator, ...@@ -309,4 +309,4 @@ template<typename RandomAccessIterator,
} }
} // end namespace } // end namespace
#endif #endif /* _GLIBCXX_PARALLEL_WORKSTEALING_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment