diff --git a/Util/OpenMPReplacement.h b/Util/OpenMPReplacement.h new file mode 100644 index 000000000..c92324676 --- /dev/null +++ b/Util/OpenMPReplacement.h @@ -0,0 +1,25 @@ +/* + open source routing machine + Copyright (C) Dennis Luxen, others 2010 + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU AFFERO General Public License as published by +the Free Software Foundation; either version 3 of the License, or +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +or see http://www.gnu.org/licenses/agpl.txt. + +*/ + +const int omp_get_num_procs() { return 1; } +const int omp_get_max_threads() { return 1; } +const int omp_get_thread_num() { return 0; } +const int omp_set_num_threads(int i) {} diff --git a/createHierarchy.cpp b/createHierarchy.cpp index 0464e36eb..f9c68578d 100644 --- a/createHierarchy.cpp +++ b/createHierarchy.cpp @@ -37,12 +37,9 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #ifdef _OPENMP -#include +#include #else -int omp_get_num_procs() { return 1; } -int omp_get_max_threads() { return 1; } -int omp_get_thread_num() { return 0; } -int omp_set_num_threads(int i) {} +#include "Util/OpenMPReplacement.h" #endif #include "typedefs.h" diff --git a/extractor.cpp b/extractor.cpp index 11517362b..0f9e398af 100644 --- a/extractor.cpp +++ b/extractor.cpp @@ -17,6 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or see http://www.gnu.org/licenses/agpl.txt. */ + #ifdef STXXL_VERBOSE_LEVEL #undef STXXL_VERBOSE_LEVEL #endif @@ -42,6 +43,12 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #include +#ifdef _OPENMP +#include +#else +#include "Util/OpenMPReplacement.h" +#endif + #include "typedefs.h" #include "DataStructures/InputReaderFactory.h" #include "DataStructures/ExtractorCallBacks.h" diff --git a/routed.cpp b/routed.cpp index 69595921f..80f0b4ac4 100644 --- a/routed.cpp +++ b/routed.cpp @@ -21,17 +21,15 @@ or see http://www.gnu.org/licenses/agpl.txt. #include #include -#ifdef _OPENMP -#include -#else -int omp_get_num_procs() { return 1; } -int omp_get_max_threads() { return 1; } -int omp_get_thread_num() { return 0; } -#endif - #include #include +#ifdef _OPENMP +#include +#else +#include "Util/OpenMPReplacement.h" +#endif + #include "Server/ServerConfiguration.h" #include "Server/ServerFactory.h"