Skip to content

Inline Rcpp_list6() #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eddelbuettel merged 2 commits into from
Mar 17, 2020
Merged

Inline Rcpp_list6() #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfdb196
Inline `Rcpp_list6()` for compatibility with R 3.3
DavisVaughan Mar 17, 2020
f122c2d
Update ChangeLog
DavisVaughan Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2020-03-17 Davis Vaughan <davis@rstudio.com>

* inst/include/Rcpp/lang.h: Inline Rcpp_list6() to support R 3.3.

2020-03-17 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
Expand Down
14 changes: 13 additions & 1 deletion inst/include/Rcpp/lang.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down