bug fixed in cpp native routine registraction

wadpac · May 8, 2017 · 6c83256 · 6c83256
1 parent 426fb68
commit 6c83256
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -22,5 +22,5 @@ importFrom("stats", "aggregate.data.frame", "weighted.mean")
 import(data.table)
 importFrom("stats", "aggregate")
 importFrom("utils", "setTxtProgressBar", "txtProgressBar")
-useDynLib(GGIR, .registration=TRUE,.fixes = "C_")
+useDynLib(GGIR, .registration=TRUE)
 importFrom(Rcpp, sourceCpp)
diff --git a/src/init.c b/src/init.c
@@ -3,13 +3,8 @@
 #include <stdlib.h> // for NULL
 #include <R_ext/Rdynload.h>
 
-/* FIXME: 
-   Check these declarations against the C/Fortran source code.
-*/
-
-/* .Call calls */
-extern SEXP GGIR_numUnpack(SEXP pack);
-extern SEXP GGIR_resample(SEXP raw, SEXP rawTime, SEXP time, SEXP stop);
+extern SEXP GGIR_numUnpack(SEXP);
+extern SEXP GGIR_resample(SEXP, SEXP, SEXP, SEXP);
 
 static const R_CallMethodDef CallEntries[] = {
     {"GGIR_numUnpack", (DL_FUNC) &GGIR_numUnpack, 1},
@@ -21,5 +16,4 @@ void R_init_GGIR(DllInfo *dll)
 {
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
     R_useDynamicSymbols(dll, FALSE);
-    R_forceSymbols(dll, TRUE);
 }