roll minor version and date, update NEWS

RcppCore · Mar 18, 2020 · c059c5f · c059c5f
1 parent 6eac444
commit c059c5f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,12 @@
 2020-03-18  Dirk Eddelbuettel  <edd@debian.org>
 
-	* inst/include/Rcpp/lang.h: Define Rcpp_list{2,3,4,5} in Rcpp namespace
+	* DESCRIPTION (Version, Date): Roll minor version
+        * inst/include/Rcpp/config.h: Idem
+
+	* inst/include/Rcpp/lang.h: Define Rcpp_list{2,3,4,5} in the Rcpp
+	namespace
+
+	* DESCRIPTION: Remove versioned depends on R (>= 3.0.0) from 2013
 
 2020-03-17  Davis Vaughan  <davis@rstudio.com>
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 1.0.4.2
-Date: 2020-03-17
+Version: 1.0.4.3
+Date: 2020-03-18
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <edd@debian.org>
@@ -14,7 +14,6 @@ Description: The 'Rcpp' package provides R functions as well as C++ classes whic
  Francois (2011, <doi:10.18637/jss.v040.i08>), the book by Eddelbuettel (2013,
  <doi:10.1007/978-1-4614-6868-4>) and the paper by Eddelbuettel and Balamuta (2018,
  <doi:10.1080/00031305.2017.1375990>); see 'citation("Rcpp")' for details.
-Depends: R (>= 3.0.0)
 Imports: methods, utils
 Suggests: tinytest, inline, rbenchmark, pkgKitten (>= 0.1.2)
 URL: http://www.rcpp.org, http://dirk.eddelbuettel.com/code/rcpp.html, https://github.com/RcppCore/Rcpp

diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd
@@ -11,6 +11,8 @@
       proper include behavior (Kevin in \ghpr{1047} fixing \ghit{1046}).
       \item A missing \code{Rcpp_list6} definition was added to support
       R 3.3.* builds (Davis Vaughan in \ghpr{1049} fixing \ghit{1048}).
+      \item Missing \code{Rcpp_list{2,3,4,5} definition were added to
+      the Rcpp namespace (Dirk fixing \ghit{1053}).
     }
   }
 }

diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h
@@ -30,7 +30,7 @@
 #define RCPP_VERSION_STRING     "1.0.4"
 
 // the current source snapshot
-#define RCPP_DEV_VERSION        RcppDevVersion(1,0,4,2)
-#define RCPP_DEV_VERSION_STRING "1.0.4.2"
+#define RCPP_DEV_VERSION        RcppDevVersion(1,0,4,3)
+#define RCPP_DEV_VERSION_STRING "1.0.4.3"
 
 #endif
diff --git a/inst/include/Rcpp/lang.h b/inst/include/Rcpp/lang.h
@@ -21,6 +21,7 @@
 #ifndef Rcpp__lang_h
 #define Rcpp__lang_h
 
+#define Rcpp_list1 Rf_list1
 #define Rcpp_lang1 Rf_lang1
 #define Rcpp_lang2 Rf_lang2
 #define Rcpp_lang3 Rf_lang3
@@ -32,13 +33,6 @@
 
 namespace Rcpp {
 
-inline SEXP Rcpp_list1(SEXP x0) {
-    PROTECT(x0);
-    x0 = Rf_cons(x0);
-    UNPROTECT(1);
-    return x0;
-}
-
 inline SEXP Rcpp_list2(SEXP x0, SEXP x1) {
     PROTECT(x0);
     x0 = Rf_cons(x0, Rcpp_list1(x1));