From cfdb196267a8b04b2bda897c1bb7f2496bf3edcd Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Tue, 17 Mar 2020 10:56:14 -0400 Subject: [PATCH 1/2] Inline `Rcpp_list6()` for compatibility with R 3.3 --- inst/include/Rcpp/lang.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/inst/include/Rcpp/lang.h b/inst/include/Rcpp/lang.h index 26a86f3df..9382a8b7d 100644 --- a/inst/include/Rcpp/lang.h +++ b/inst/include/Rcpp/lang.h @@ -32,13 +32,25 @@ #define Rcpp_lang4 Rf_lang4 #define Rcpp_list5 Rf_list5 #define Rcpp_lang5 Rf_lang5 -#define Rcpp_list6 Rf_list6 #define Rcpp_lang6 Rf_lang6 #define Rcpp_lcons Rf_lcons namespace Rcpp { +// `Rf_lang6()` is available on R 3.3, but `Rf_list6()` is not +inline SEXP Rcpp_list6( SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5 ) +{ + PROTECT(x0); + x0 = Rf_cons(x0, Rcpp_list5(x1, x2, x3, x4, x5)); + UNPROTECT(1); + return x0; +} + + + + + inline SEXP Rcpp_list7( SEXP x0, SEXP x1, SEXP x2, SEXP x3, SEXP x4, SEXP x5, SEXP x6 ) { PROTECT(x0); From f122c2d0b3ae873d6807f3eeb05dc89d1af678d6 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Tue, 17 Mar 2020 10:56:36 -0400 Subject: [PATCH 2/2] Update ChangeLog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6f6bc1135..95a4ab760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2020-03-17 Davis Vaughan + + * inst/include/Rcpp/lang.h: Inline Rcpp_list6() to support R 3.3. + 2020-03-17 Dirk Eddelbuettel * DESCRIPTION (Version, Date): Roll minor version