Skip to content

Commit 430e88a

Browse files
committed
Don't search the inline package as a fallback when loading plugins for the the Rcpp::plugins attribute
1 parent f963d4b commit 430e88a

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-09-18 JJ Allaire <jj@rstudio.org>
2+
3+
* R/Attributes.R: Don't search the inline package as a fallback when loading plugins for the the Rcpp::plugins attribute
4+
15
2013-09-16 Romain Francois <romain@r-enthusiasts.com>
26

37
* vignettes/Rcpp-package.Rnw: Updating the vignette. Setting attributes to TRUE

R/Attributes.R

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -474,20 +474,13 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
474474
error = function(e) NULL)
475475
}
476476

477-
# Lookup a plugin (first in our package then in the inline package)
477+
# Lookup a plugin
478478
.findPlugin <- function(pluginName) {
479-
# lookup in our plugins
479+
480480
plugin <- .plugins[[pluginName]]
481-
482-
# if necessary lookup in the inline package
483-
if (is.null(plugin))
484-
if (length(find.package("inline", quiet=TRUE)) > 0)
485-
plugin <- inline:::plugins[[pluginName]]
486-
487-
# error if plugin not found
488481
if (is.null(plugin))
489482
stop("Inline plugin '", pluginName, "' could not be found ",
490-
"within either the Rcpp or inline package. You should be ",
483+
"within the Rcpp package. You should be ",
491484
"sure to call registerPlugin before using a plugin.")
492485

493486
return(plugin)

inst/NEWS.Rd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
we can now use references, pointers and const versions of them.
5151
The file \code{Module.cpp} file has an example.
5252
\item{No longer call non-exported functions from the tools package}
53+
\item{No longer search the inline package as a fallback when loading
54+
plugins for the the \code{Rcpp::plugins} attribute}.
5355
}
5456
\item Changes in Modules:
5557
\itemize{

man/pluginsAttribute.Rd

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ The \code{Rcpp::plugins} attribute is added to a C++ source file to specify the
2121
Plugins must be registered using the \code{\link{registerPlugin}}
2222
function.
2323

24-
If a plugin is not found within the \pkg{Rcpp} package then the
25-
\pkg{inline} package will also be searched for a matching plugin.
26-
2724
When included within a \code{\link{sourceCpp}} translation unit,
2825
the configuration-related fields of the plugin (e.g. \code{env} and
2926
\code{LinkingTo}) are utilized, however the code-generation fields

0 commit comments

Comments
 (0)