Rename internal function

stewid · Mar 18, 2017 · 87dc667 · 87dc667
1 parent 91b1769
commit 87dc667
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/R/SimInf.R b/R/SimInf.R
@@ -41,7 +41,7 @@ NULL
 ##' @keywords internal
 have_openmp <- function()
 {
-    .Call("siminf_have_openmp", PACKAGE = "SimInf")
+    .Call(SimInf_have_openmp)
 }
 
 ##' Scheduled events example data

diff --git a/src/SimInf.c b/src/SimInf.c
@@ -185,17 +185,3 @@ SEXP SimInf_run(
 
     return trajectory;
 }
-
-/**
- * Is OpenMP available
- */
-SEXP siminf_have_openmp()
-{
-    return Rf_ScalarLogical(
-#ifdef _OPENMP
-        1
-#else
-        0
-#endif
-        );
-}
diff --git a/src/init.c b/src/init.c
@@ -31,7 +31,20 @@ SEXP SISe3_run(SEXP, SEXP, SEXP);
 SEXP SISe3_sp_run(SEXP, SEXP, SEXP);
 SEXP SISe_sp_run(SEXP, SEXP, SEXP);
 SEXP siminf_ldata_sp(SEXP, SEXP, SEXP);
-SEXP siminf_have_openmp();
+
+/**
+ * Is OpenMP available
+ */
+SEXP SimInf_have_openmp()
+{
+    return Rf_ScalarLogical(
+#ifdef _OPENMP
+        1
+#else
+        0
+#endif
+        );
+}
 
 #define CALLDEF(name, n) {#name, (DL_FUNC) &name, n}
 
@@ -43,7 +56,7 @@ static const R_CallMethodDef callMethods[] =
     CALLDEF(SISe3_run, 3),
     CALLDEF(SISe3_sp_run, 3),
     CALLDEF(SISe_sp_run, 3),
-    CALLDEF(siminf_have_openmp, 0),
+    CALLDEF(SimInf_have_openmp, 0),
     CALLDEF(siminf_ldata_sp, 3),
     {NULL, NULL, 0}
 };