Skip to content

Commit 16692bc

Browse files
committed
Call inlineCxxPlugin and Rcpp.plugin.maker without qualification rather than with '...'
1 parent 832bd20 commit 16692bc

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-09-17 JJ Allaire <jj@rstudio.org>
2+
3+
* R/Attributes.R: Call inlineCxxPlugin and Rcpp.plugin.maker without qualification rather than with '...'
4+
15
2013-09-17 Dirk Eddelbuettel <edd@debian.org>
26

37
* NAMESPACE: Export RcppLdFlags which is often used to build Rcpp

R/Attributes.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
561561

562562
# if there is no buildEnv from a plugin then use the Rcpp plugin
563563
if (length(buildEnv) == 0) {
564-
buildEnv <- Rcpp:::inlineCxxPlugin()$env
564+
buildEnv <- inlineCxxPlugin()$env
565565
} else {
566566
# we are using a plugin -- confirm that the plugin includes the Rcpp
567567
# PKG_LIBS and if it doesn't then add them
@@ -795,7 +795,7 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
795795
# Rcpp.plugin.maker. If the plugin$includes has this suffix we know
796796
# it's an Rcpp plugin
797797
token <- "include_after_token"
798-
stockRcppPlugin <- Rcpp:::Rcpp.plugin.maker(include.after=token)
798+
stockRcppPlugin <- Rcpp.plugin.maker(include.after=token)
799799
includes <- stockRcppPlugin()$includes
800800
suffix <- strsplit(includes, token)[[1]][[2]]
801801

0 commit comments

Comments
 (0)