types.h: Remove enum parallelism.

2008-02-15  Benjamin Kosnik  <bkoz@redhat.com>

        * include/parallel/types.h: Remove enum parallelism.

From-SVN: r132364

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 05b5e7d99f4bdd2cb02f5175927400f4daf8b1cd..b9be543495451197c484b242a3865825c3b1ac5f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+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

diff --git a/libstdc++-v3/include/parallel/types.h b/libstdc++-v3/include/parallel/types.h
index 2f0e459540006566d6686a280a2838fdd1561bd2..beac77810a8a750cf11ba7684ce67e025736a1b7 100644 (file)
--- 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;