diff --git a/Contractor/ContractionCleanup.h b/Contractor/ContractionCleanup.h index 4786e58ca..c1f08b081 100644 --- a/Contractor/ContractionCleanup.h +++ b/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 -#else #include -#endif #ifndef _WIN32 #include #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: diff --git a/DataStructures/StaticKDTree.h b/DataStructures/StaticKDTree.h index bfc5e24b0..87f2dcf49 100644 --- a/DataStructures/StaticKDTree.h +++ b/DataStructures/StaticKDTree.h @@ -24,11 +24,7 @@ KD Tree coded by Christian Vetter, Monav Project #define STATICKDTREE_H_INCLUDED #include -#ifdef _GLIBCXX_PARALLEL -#include -#else #include -#endif #include #include @@ -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 ) ); } diff --git a/Util/GraphLoader.h b/Util/GraphLoader.h index bb3de954e..1bc37a7f6 100644 --- a/Util/GraphLoader.h +++ b/Util/GraphLoader.h @@ -23,6 +23,8 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #include + +#include #include #include #include @@ -30,12 +32,6 @@ or see http://www.gnu.org/licenses/agpl.txt. #include -#ifdef _GLIBCXX_PARALLEL -#include -#else -#include -#endif - #include "../DataStructures/ImportEdge.h" #include "../typedefs.h"