Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Forgot to resolve conflict

Browse Source
This commit is contained in:
DennisOSRM 2011-11-26 13:36:45 +01:00
parent caf908669f
commit aac6f45f54
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
createHierarchy.cpp
View File

@ -39,14 +39,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
#ifdef _OPENMP #ifdef _OPENMP
#include <omp.h> #include <omp.h>
#else #else
<<<<<<< HEAD
int omp_get_num_procs() { return 1; }
int omp_get_max_threads() { return 1; }
int omp_get_thread_num() { return 0; }
void omp_set_num_threads(int i) {}
=======
#include "Util/OpenMPReplacement.h" #include "Util/OpenMPReplacement.h"
>>>>>>> b5a1bf6a848b68bace62814497de44ce6c3fab5d
#endif #endif
#include "typedefs.h" #include "typedefs.h"