Several updates to please R-devel aka R 4.5.0

Additional (now mandatory) prefixing of Rf_ before warning and ScalarReal
One switch from class(x) comparison to inherits(x, ...)

R/cfunction.R

@@ -106,7 +106,7 @@ cfunction <- function(sig=character(), body=character(), includes=character(), o
   	  code <- paste( code, paste(body[[i]], collapse="\n"), sep="")
   	  ## CLOSE function, add return and warning in case the user forgot it
   	  code <- paste(code, "\n  ",
-                    ifelse(Rcpp, "Rf_warning", "warning"),
+                    ifelse(Rcpp || getRversion() >= "4.5.0", "Rf_warning", "warning"),
                     "(\"your C program does not return anything!\");\n  return R_NilValue;\n}\n", sep="");
     }
 

R/utilities.R

@@ -54,7 +54,7 @@ writeCFunc <- function(x, file) {
 
 readCFunc <- function(file) {
   x <- readRDS(file)
-  if (class(x) != "CFunc") stop(file, " does not contain a serialized CFunc object")
+  if (!inherits(x, "CFunc")) stop(file, " does not contain a serialized CFunc object")
 
   # Get code for restoring after updating the function body
   source_code <- x@code

inst/tinytest/test_cxxfunction.R

@@ -3,7 +3,7 @@ library(inline)
 
 ## basic examples from manual page
 fx <- cxxfunction(signature(x = "integer", y = "numeric"),
-                  "return ScalarReal(INTEGER(x)[0] * REAL(y)[0]);")
+                  "return Rf_ScalarReal(INTEGER(x)[0] * REAL(y)[0]);")
 expect_true(is(fx, "CFunc"))
 expect_equal(fx(2L, 5), 10)
 

man/cxxfunction.Rd

@@ -30,7 +30,7 @@ rcpp(..., plugin="Rcpp")
 \dontrun{
 # default plugin
 fx <- cxxfunction(signature(x = "integer", y = "numeric"), 
-	          "return ScalarReal(INTEGER(x)[0] * REAL(y)[0]);")
+	          "return Rf_ScalarReal(INTEGER(x)[0] * REAL(y)[0]);")
 fx(2L, 5)
 
 # Rcpp plugin

man/package.skeleton.Rd

@@ -29,13 +29,13 @@ Generate the skeleton of a package
 \dontrun{
 
 fx <- cxxfunction(signature(x = "integer", y = "numeric"),
-	          "return ScalarReal( INTEGER(x)[0] * REAL(y)[0]);")
+	          "return Rf_ScalarReal( INTEGER(x)[0] * REAL(y)[0]);")
 package.skeleton("foo", fx)
 
 functions <- cxxfunction(list(ff = signature(), 
                               gg = signature(x = "integer", y = "numeric")), 
                          c("return R_NilValue ;",
-                           "return ScalarReal(INTEGER(x)[0] * REAL(y)[0]);"))
+                           "return Rf_ScalarReal(INTEGER(x)[0] * REAL(y)[0]);"))
 package.skeleton("foobar", functions)
 
 }