Skip to content

Commit c059c5f

Browse files
committed
roll minor version and date, update NEWS
1 parent 6eac444 commit c059c5f

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

ChangeLog

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
2020-03-18 Dirk Eddelbuettel <[email protected]>
22

3-
* inst/include/Rcpp/lang.h: Define Rcpp_list{2,3,4,5} in Rcpp namespace
3+
* DESCRIPTION (Version, Date): Roll minor version
4+
* inst/include/Rcpp/config.h: Idem
5+
6+
* inst/include/Rcpp/lang.h: Define Rcpp_list{2,3,4,5} in the Rcpp
7+
namespace
8+
9+
* DESCRIPTION: Remove versioned depends on R (>= 3.0.0) from 2013
410

511
2020-03-17 Davis Vaughan <[email protected]>
612

DESCRIPTION

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 1.0.4.2
4-
Date: 2020-03-17
3+
Version: 1.0.4.3
4+
Date: 2020-03-18
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>
@@ -14,7 +14,6 @@ Description: The 'Rcpp' package provides R functions as well as C++ classes whic
1414
Francois (2011, <doi:10.18637/jss.v040.i08>), the book by Eddelbuettel (2013,
1515
<doi:10.1007/978-1-4614-6868-4>) and the paper by Eddelbuettel and Balamuta (2018,
1616
<doi:10.1080/00031305.2017.1375990>); see 'citation("Rcpp")' for details.
17-
Depends: R (>= 3.0.0)
1817
Imports: methods, utils
1918
Suggests: tinytest, inline, rbenchmark, pkgKitten (>= 0.1.2)
2019
URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp

inst/NEWS.Rd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
proper include behavior (Kevin in \ghpr{1047} fixing \ghit{1046}).
1212
\item A missing \code{Rcpp_list6} definition was added to support
1313
R 3.3.* builds (Davis Vaughan in \ghpr{1049} fixing \ghit{1048}).
14+
\item Missing \code{Rcpp_list{2,3,4,5} definition were added to
15+
the Rcpp namespace (Dirk fixing \ghit{1053}).
1416
}
1517
}
1618
}

inst/include/Rcpp/config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define RCPP_VERSION_STRING "1.0.4"
3131

3232
// the current source snapshot
33-
#define RCPP_DEV_VERSION RcppDevVersion(1,0,4,2)
34-
#define RCPP_DEV_VERSION_STRING "1.0.4.2"
33+
#define RCPP_DEV_VERSION RcppDevVersion(1,0,4,3)
34+
#define RCPP_DEV_VERSION_STRING "1.0.4.3"
3535

3636
#endif

inst/include/Rcpp/lang.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#ifndef Rcpp__lang_h
2222
#define Rcpp__lang_h
2323

24+
#define Rcpp_list1 Rf_list1
2425
#define Rcpp_lang1 Rf_lang1
2526
#define Rcpp_lang2 Rf_lang2
2627
#define Rcpp_lang3 Rf_lang3
@@ -32,13 +33,6 @@
3233

3334
namespace Rcpp {
3435

35-
inline SEXP Rcpp_list1(SEXP x0) {
36-
PROTECT(x0);
37-
x0 = Rf_cons(x0);
38-
UNPROTECT(1);
39-
return x0;
40-
}
41-
4236
inline SEXP Rcpp_list2(SEXP x0, SEXP x1) {
4337
PROTECT(x0);
4438
x0 = Rf_cons(x0, Rcpp_list1(x1));

0 commit comments

Comments
 (0)