merge from master

Merge remote-tracking branch 'origin/master' into feature/xptr-improvements

Conflicts:
	ChangeLog
	inst/NEWS.Rd

Author: jjallaire

ChangeLog

@@ -1,4 +1,4 @@
-2014-02-02  JJ Allaire  <jj@rstudio.org>
+2014-02-03  JJ Allaire  <jj@rstudio.org>
 
         * inst/include/Rcpp/XPtr.h: Improvements to XPtr including new
         checked_get and release functions and improved behavior (throw
@@ -7,6 +7,19 @@
         * inst/unitTests/runit.XPTr.R: tests for XPtr improvements.
         * inst/unitTests/cpp/XPtr.cpp: tests for XPtr improvements.
 
+2014-02-03  JJ Allaire  <jj@rstudio.org>
+
+        * R/Attributes.R: Include pkg_types.h file in RcppExports.cpp
+        if it's present in inst/include or src
+        * src/attributes.cpp: Include pkg_types.h file in generated
+        C++ interface file if it's present in inst/include or src
+
+2015-02-02  JJ Allaire  <jj@rstudio.org>
+
+        * R/exceptions.R: Evaluate R code within an R_toplevelExec block
+        * include/Rcpp/api/meat/Rcpp_eval.h: Evaluate R code within an
+        R_toplevelExec block
+
 2015-01-25  Kevin Ushey  <kevinushey@gmail.com>
 
         * inst/include/Rcpp/utils/tinyformat.h: define an error handler for

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.4
-Date: 2015-01-20
+Version: 0.11.4.2
+Date: 2015-02-03
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>

R/Attributes.R

@@ -380,15 +380,24 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
     linkingTo <- .readPkgDescField(pkgDesc, "LinkingTo")
     includes <- .linkingToIncludes(linkingTo, TRUE)
 
-    # if a master include file is defined for the package then include it
-    pkgHeader <- paste(pkgname, ".h", sep="")
+    # if a master include file or types file is in inst/include then use it
+    typesHeader <- c(paste0(pkgname, "_types.h"), paste0(pkgname, "_types.hpp"))
+    pkgHeader <- c(paste0(pkgname, ".h"), typesHeader)
     pkgHeaderPath <- file.path(pkgdir, "inst", "include",  pkgHeader)
-    if (file.exists(pkgHeaderPath)) {
+    pkgHeader <- pkgHeader[file.exists(pkgHeaderPath)]
+    if (length(pkgHeader) > 0) {
         pkgInclude <- paste("#include \"../inst/include/",
                             pkgHeader, "\"", sep="")
         includes <- c(pkgInclude, includes)
     }
 
+    # if a _types file is in src then include it
+    pkgHeader <- typesHeader
+    pkgHeaderPath <- file.path(pkgdir, "src", pkgHeader)
+    pkgHeader <- pkgHeader[file.exists(pkgHeaderPath)]
+    if (length(pkgHeader) > 0)
+        includes <- c(paste0("#include \"", pkgHeader ,"\""), includes)
+
     # generate exports
     invisible(.Call("compileAttributes", PACKAGE="Rcpp",
                     pkgdir, pkgname, depends, cppFiles, cppFileBasenames,

R/exceptions.R

@@ -19,3 +19,18 @@
     invisible( .Call( rcpp_error_recorder, e ) )
 }
 
+.warningsEnv <- new.env()
+.warningsEnv$warnings <- character()
+
+.rcpp_warning_recorder <- function(w){
+    .warningsEnv$warnings <- append(.warningsEnv$warnings, w$message)
+    invokeRestart("muffleWarning")
+}
+
+.rcpp_collect_warnings <- function() {
+    warnings <- .warningsEnv$warnings
+    .warningsEnv$warnings <- character()
+    warnings
+}
+
+