[Rcpp-commits] r4499 - in pkg/Rcpp: . R

[noreply at r-forge.r-project.org]

Author: jjallaire
Date: 2013-09-17 23:27:17 +0200 (Tue, 17 Sep 2013)
New Revision: 4499

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/R/Attributes.R
Log:
Call inlineCxxPlugin and Rcpp.plugin.maker without qualification rather than with '...'

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2013-09-17 19:38:24 UTC (rev 4498)
+++ pkg/Rcpp/ChangeLog	2013-09-17 21:27:17 UTC (rev 4499)
@@ -1,3 +1,7 @@
+2013-09-17  JJ Allaire  <jj at rstudio.org>
+
+    * R/Attributes.R: Call inlineCxxPlugin and Rcpp.plugin.maker without qualification rather than with '...'
+
 2013-09-17  Dirk Eddelbuettel  <edd at debian.org>
 
 	* NAMESPACE: Export RcppLdFlags which is often used to build Rcpp

Modified: pkg/Rcpp/R/Attributes.R
===================================================================
--- pkg/Rcpp/R/Attributes.R	2013-09-17 19:38:24 UTC (rev 4498)
+++ pkg/Rcpp/R/Attributes.R	2013-09-17 21:27:17 UTC (rev 4499)
@@ -561,7 +561,7 @@
 
     # if there is no buildEnv from a plugin then use the Rcpp plugin
     if (length(buildEnv) == 0) {
-        buildEnv <- Rcpp:::inlineCxxPlugin()$env
+        buildEnv <- inlineCxxPlugin()$env
     } else {
         # we are using a plugin -- confirm that the plugin includes the Rcpp
         # PKG_LIBS and if it doesn't then add them
@@ -795,7 +795,7 @@
     # Rcpp.plugin.maker. If the plugin$includes has this suffix we know
     # it's an Rcpp plugin
     token <- "include_after_token"
-    stockRcppPlugin <- Rcpp:::Rcpp.plugin.maker(include.after=token)
+    stockRcppPlugin <- Rcpp.plugin.maker(include.after=token)
     includes <- stockRcppPlugin()$includes
     suffix <- strsplit(includes, token)[[1]][[2]]