Merge pull request #396 from SebKrantz/development

Reorganizing header files to avoid namespace conflicts with OpenMP.

Author: SebKrantz

src/collapse_c.h

@@ -1,6 +1,14 @@
 #ifdef _OPENMP
-#include <omp.h>
+  #include <omp.h>
+  #define OMP_NUM_PROCS omp_get_num_procs()
+  #define OMP_THREAD_LIMIT omp_get_thread_limit()
+  #define OMP_MAX_THREADS omp_get_max_threads()
+#else
+  #define OMP_NUM_PROCS 1
+  #define OMP_THREAD_LIMIT 1
+  #define OMP_MAX_THREADS 1
 #endif
+
 #include <R.h>
 #include <Rinternals.h>
 

src/data.table_init.c

@@ -3,20 +3,8 @@
  and licensed under a Mozilla Public License 2.0 (MPL-2.0) license.
 */
 
-#ifdef _OPENMP
-  #include <omp.h>
-  #define OMP_NUM_PROCS omp_get_num_procs()
-  #define OMP_THREAD_LIMIT omp_get_thread_limit()
-  #define OMP_MAX_THREADS omp_get_max_threads()
-#else
-  #define OMP_NUM_PROCS 1
-  #define OMP_THREAD_LIMIT 1
-  #define OMP_MAX_THREADS 1
-#endif
-
-
+#include "collapse_c.h" // Needs to be first because includes OpenMP, to avoid namespace conflicts.
 #include "data.table.h"
-#include "collapse_c.h"
 #include <Rdefines.h>
 // #include <R_ext/Rdynload.h>
 // #include <R_ext/Visibility.h>

src/fmode.c

@@ -1,4 +1,4 @@
-#include "collapse_c.h"
+#include "collapse_c.h" // Needs to be first because includes OpenMP
 #include "kit.h"
 
 

src/fndistinct.c

@@ -1,5 +1,5 @@
+#include "collapse_c.h" // Needs to be first because includes OpenMP
 #include "kit.h"
-#include "collapse_c.h"
 
 // C-implementations for different data types ----------------------------------
 // TODO: outsource and memset hash table?