Merge branch 'cytoset' of github.com:FredHutch/cytolib into cytoset

RGLab · Sep 25, 2019 · 9f89a17 · 9f89a17
2 parents f31d945 + 7f55b67
commit 9f89a17
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,5 @@
 # Generated by roxygen2: do not edit by hand
 
-export(LdFlags)
+export(cytolib_LdFlags)
 importFrom(RProtoBufLib,LdFlags)
 importFrom(RcppParallel,RcppParallelLibs)
diff --git a/R/build.R b/R/build.R
@@ -15,18 +15,18 @@ CxxFlags <- function() {
 # to sourceCpp via the inlineCxxPlugin (defined below) and to packages 
 # via a line in Makevars[.win] like this:
 #
-#   PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "cytolib::LdFlags()")
+#   PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "cytolib::cytolib_LdFlags()")
 #' @export
 #' @importFrom RProtoBufLib LdFlags
 #' @importFrom RcppParallel RcppParallelLibs
 #' @noRd
-LdFlags <- function(...) {
+cytolib_LdFlags <- function(...) {
    cat(cytolibLdFlags(...))
 }
 
 # alias for backward compatibility
 cytolibLibs <- function() {
-   LdFlags()
+   cytolib_LdFlags()
 }