fix compilation on mac; openmp issues and an unneeded typename

Contractor/ContractionCleanup.h

@@ -31,10 +31,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #endif
 #include "Contractor.h"
 
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
 class ContractionCleanup {
 private:
 

Contractor/Contractor.h

@@ -30,15 +30,13 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #include "../DataStructures/DynamicGraph.h"
 #include "../DataStructures/Percent.h"
 #include "../DataStructures/BinaryHeap.h"
+#include "../Util/OpenMPReplacement.h"
 #include <ctime>
 #include <vector>
 #include <queue>
 #include <set>
 #include <stack>
 #include <limits>
-#ifdef _OPEMP
-#include <omp.h>
-#endif
 
 class Contractor {
 
@@ -190,7 +188,7 @@ public:
     }
 
     ~Contractor() { }
-
+	
     void Run() {
         const NodeID numberOfNodes = _graph->GetNumberOfNodes();
         Percent p (numberOfNodes);

Contractor/EdgeBasedGraphFactory.cpp

@@ -25,6 +25,7 @@
 #endif
 #include <boost/foreach.hpp>
 
+#include "../Util/OpenMPReplacement.h"
 #include "EdgeBasedGraphFactory.h"
 
 template<>
@@ -39,7 +40,7 @@ EdgeBasedGraphFactory::EdgeBasedGraphFactory(int nodes, std::vector<NodeBasedEdg
 
     std::vector< _NodeBasedEdge > edges;
     edges.reserve( 2 * inputEdges.size() );
-    for ( typename std::vector< NodeBasedEdge >::const_iterator i = inputEdges.begin(), e = inputEdges.end(); i != e; ++i ) {
+    for ( std::vector< NodeBasedEdge >::const_iterator i = inputEdges.begin(), e = inputEdges.end(); i != e; ++i ) {
         _NodeBasedEdge edge;
         edge.source = i->source();
         edge.target = i->target();