regenerate Rcpp files with latest Rcpp

RGLab · Apr 12, 2018 · 954af1c · 954af1c
1 parent 76e6c13
commit 954af1c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: openCyto
 Type: Package
 Title: Hierarchical Gating Pipeline for flow cytometry data
-Version: 1.17.5
+Version: 1.17.6
 Date: 2012-06-11
 Author: Mike Jiang, John Ramey, Greg Finak, Raphael Gottardo
 Maintainer: Mike Jiang <wjiang2@fhcrc.org>

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,7 +1,7 @@
-# This file was generated by Rcpp::compileAttributes
+# Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 collapseData <- function(mat_list, colnames) {
-    .Call('openCyto_collapseData', PACKAGE = 'openCyto', mat_list, colnames)
+    .Call('_openCyto_collapseData', PACKAGE = 'openCyto', mat_list, colnames)
 }
 
diff --git a/R/coerce.R b/R/coerce.R
@@ -33,7 +33,7 @@ setAs(from="ncdfFlowSet", to="flowFrame", def=function(from)
 
 
         desc  <- list(description="Synthetic Frame",sampleNames=sampleNames(from))
-        new("flowFrame",exprs = .Call('openCyto_collapseData', PACKAGE = 'openCyto', mat_list, colnames)
+        new("flowFrame",exprs = collapseData(mat_list, colnames)
             , parameters = params
             , description = desc
         )

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -1,4 +1,4 @@
-// This file was generated by Rcpp::compileAttributes
+// Generated by using Rcpp::compileAttributes() -> do not edit by hand
 // Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 #include <Rcpp.h>
@@ -7,13 +7,26 @@ using namespace Rcpp;
 
 // collapseData
 NumericMatrix collapseData(List mat_list, StringVector colnames);
-RcppExport SEXP openCyto_collapseData(SEXP mat_listSEXP, SEXP colnamesSEXP) {
+RcppExport SEXP _openCyto_collapseData(SEXP mat_listSEXP, SEXP colnamesSEXP) {
 BEGIN_RCPP
-    Rcpp::RObject __result;
-    Rcpp::RNGScope __rngScope;
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< List >::type mat_list(mat_listSEXP);
     Rcpp::traits::input_parameter< StringVector >::type colnames(colnamesSEXP);
-    __result = Rcpp::wrap(collapseData(mat_list, colnames));
-    return __result;
+    rcpp_result_gen = Rcpp::wrap(collapseData(mat_list, colnames));
+    return rcpp_result_gen;
 END_RCPP
 }
+
+RcppExport SEXP unlockNamespace(SEXP);
+
+static const R_CallMethodDef CallEntries[] = {
+    {"_openCyto_collapseData", (DL_FUNC) &_openCyto_collapseData, 2},
+    {"unlockNamespace",        (DL_FUNC) &unlockNamespace,        1},
+    {NULL, NULL, 0}
+};
+
+RcppExport void R_init_openCyto(DllInfo *dll) {
+    R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
+    R_useDynamicSymbols(dll, FALSE);
+}