Removing leftovers of STL parallel mode experiments

Contractor/ContractionCleanup.h

@@ -21,11 +21,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef CONTRACTIONCLEANUP_H_INCLUDED
 #define CONTRACTIONCLEANUP_H_INCLUDED
 
-#ifdef _GLIBCXX_PARALLEL
-#include <parallel/algorithm>
-#else
 #include <algorithm>
-#endif
 #ifndef _WIN32
 #include <sys/time.h>
 #endif
@@ -120,11 +116,7 @@ public:
                 edges.push_back( newEdge );
             }
         }
-#ifdef _GLIBCXX_PARALLEL
-        __gnu_parallel::sort( edges.begin(), edges.end() );
-#else
         sort( edges.begin(), edges.end() );
-#endif
     }
 
 private:

DataStructures/StaticKDTree.h

@@ -24,11 +24,7 @@ KD Tree coded by Christian Vetter, Monav Project
 #define STATICKDTREE_H_INCLUDED
 
 #include <vector>
-#ifdef _GLIBCXX_PARALLEL
-#include <parallel/algorithm>
-#else
 #include <algorithm>
-#endif
 #include <stack>
 #include <limits>
 
@@ -119,11 +115,7 @@ public:
                 continue;
 
             Iterator middle = tree.left + ( tree.right - tree.left ) / 2;
-#ifdef _GLIBCXX_PARALLEL
-            __gnu_parallel::nth_element( kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less( tree.dimension ) );
-#else
             std::nth_element( kdtree + tree.left, kdtree + middle, kdtree + tree.right, Less( tree.dimension ) );
-#endif
             s.push( Tree( tree.left, middle, ( tree.dimension + 1 ) % k ) );
             s.push( Tree( middle + 1, tree.right, ( tree.dimension + 1 ) % k ) );
         }

Util/GraphLoader.h

@@ -23,6 +23,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include <cassert>
 #include <cmath>
+
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <iomanip>
@@ -30,12 +32,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 
 #include <boost/unordered_map.hpp>
 
-#ifdef _GLIBCXX_PARALLEL
-#include <parallel/algorithm>
-#else
-#include <algorithm>
-#endif
-
 #include "../DataStructures/ImportEdge.h"
 #include "../typedefs.h"