diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2008-02-16 06:15:39 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-02-16 06:15:39 +0000 |
| commit | 257a545bc0eb3afa09fe9514bee2bdc5eaa2189e (patch) | |
| tree | a9b75cb2b9b9a427c95fab60d29eda02fef4e67d | |
| parent | 2a49e6f89795142cac2a9e18b92cf0251ad54591 (diff) | |
| download | gcc-257a545bc0eb3afa09fe9514bee2bdc5eaa2189e.zip gcc-257a545bc0eb3afa09fe9514bee2bdc5eaa2189e.tar.gz gcc-257a545bc0eb3afa09fe9514bee2bdc5eaa2189e.tar.bz2 | |
types.h: Remove enum parallelism.
2008-02-15 Benjamin Kosnik <bkoz@redhat.com>
* include/parallel/types.h: Remove enum parallelism.
From-SVN: r132364
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/types.h | 54 |
2 files changed, 4 insertions, 54 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 05b5e7d..b9be543 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,8 @@ 2008-02-15 Benjamin Kosnik <bkoz@redhat.com> + + * include/parallel/types.h: Remove enum parallelism. + +2008-02-15 Benjamin Kosnik <bkoz@redhat.com> * include/parallel/types.h: Move enum parallelism here. Use tr1/cstdint's int16_t, uint16_t, int32_t, uint32_t, int64_t, diff --git a/libstdc++-v3/include/parallel/types.h b/libstdc++-v3/include/parallel/types.h index 2f0e459..beac778 100644 --- a/libstdc++-v3/include/parallel/types.h +++ b/libstdc++-v3/include/parallel/types.h @@ -70,60 +70,6 @@ namespace __gnu_parallel inline bool is_parallel(const parallelism __p) { return __p != sequential; } - /// @brief Sorting algorithms: multi-way mergesort, quicksort, - /// load-balanced quicksort. - enum SortAlgorithm - { - MWMS, - QS, - QS_BALANCED - }; - - /// @brief Merging algorithms: bubblesort-alike, loser-tree - /// variants, enum sentinel. - enum MultiwayMergeAlgorithm - { - BUBBLE, - LOSER_TREE_EXPLICIT, - LOSER_TREE, - LOSER_TREE_COMBINED, - LOSER_TREE_SENTINEL, - MWM_ALGORITHM_LAST - }; - - /// @brief Partial sum algorithms: recursive, linear. - enum PartialSumAlgorithm - { - RECURSIVE, - LINEAR - }; - - /// @brief Splitting strategies for sorting/merging: sampling, exact. - enum Splitting - { - SAMPLING, - EXACT - }; - - /// @brief Find distribution strategies: growing blocks, equal-sized - /// blocks, equal splitting. - enum FindDistribution - { - GROWING_BLOCKS, - CONSTANT_SIZE_BLOCKS, - EQUAL_SPLIT - }; - - /// @brief Strategies for run-time algorithm selection: - /// force_sequential, force_parallel, heuristic. - enum AlgorithmSelection - { - heuristic, - force_sequential, - force_parallel - }; - - /// Integer Types. using std::tr1::int16_t; using std::tr1::uint16_t; |