Merge remote-tracking branch 'upstream/master' into feature/no-sugar-tonight-in-my-coffee

Author: dcdillon

ChangeLog

@@ -6,19 +6,28 @@
         of RNGScope
         * inst/include/Rcpp/vector/Matrix.h: Protected Matrix op Scalar
         definitions with #ifndef RCPP_NO_SUGAR
+2016-11-10  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/date_datetime/newDateVector.h: Added constructor
+        using VectorBase<>
+
+2016-01-05  Daniel C. Dillon  <[email protected]>
+
+        * inst/include/Rcpp/date_datetime/newDatetimeVector.h: Added constructor
+        to instantiate newDatetimeVector from VectorBase.
 
 2016-11-04  Nathan Russell     <[email protected]>
 
-        * inst/include/Rcpp/macros/dispatch.h: Modify variadic macros 
+        * inst/include/Rcpp/macros/dispatch.h: Modify variadic macros
         to not use GNU extensions
         * DESCRIPTION: roll minor version
 
 2016-11-03  Nathan Russell     <[email protected]>
 
-        * inst/include/Rcpp/hash/IndexHash.h: Add casts to eliminate 
+        * inst/include/Rcpp/hash/IndexHash.h: Add casts to eliminate
         signed / unsigned comparison warning
         * inst/include/Rcpp/hash/SelfHash.h: Idem
-        * inst/unitTests/cpp/sugar.cpp: Added unit tests for sugar function 
+        * inst/unitTests/cpp/sugar.cpp: Added unit tests for sugar function
         unique()
         * inst/unitTests/runit.sugar.R: Idem
 

inst/NEWS.Rd

@@ -33,13 +33,14 @@
     \itemize{
       \item The \code{DateVector} and \code{DatetimeVector} classes were renamed
       with a prefix \code{old}; they are currently \code{typedef}'ed to the
-      existing name (\ghpr{557})
+      existing name (\ghpr{557}, also \ghpr{577})
       \item New variants \code{newDateVector} and \code{newDatetimeVector} were
-      added based on \code{NumericVector} (also (\ghpr{557})
+      added based on \code{NumericVector} (also \ghpr{557}, \ghpr{577})
       \item By defining \code{RCPP_NEW_DATE_DATETIME_VECTORS} the new classes
       can activated. We intend to make the new classes the default no sooner
       than twelve months from this release.
-      \item The \code{capabilities()} function can also be tested for this feature
+      \item The \code{capabilities()} function can also be used for presence of
+      this feature 
     }
   }
 }

inst/include/Rcpp/date_datetime/newDateVector.h

@@ -28,6 +28,9 @@ namespace Rcpp {
 
     class newDateVector : public NumericVector {
     public:
+        template <int RTYPE, bool NA, typename VEC>
+        newDateVector(const VectorBase<RTYPE,NA,VEC>& vec) : NumericVector(vec) {}
+
         newDateVector(SEXP vec) : NumericVector(vec) { setClass(); }
         newDateVector(int n) : NumericVector(n) { setClass(); }
 

inst/include/Rcpp/date_datetime/newDatetimeVector.h

@@ -28,10 +28,15 @@ namespace Rcpp {
 
     class newDatetimeVector : public NumericVector {
     public:
+        template <int RTYPE, bool NA, typename VEC>
+        newDatetimeVector(const VectorBase<RTYPE,NA,VEC>& other) :
+            NumericVector(other) {}
+
         newDatetimeVector(SEXP vec, const char* tz = "") :
             NumericVector(vec) {
             setClass(tz);
         }
+
         newDatetimeVector(int n, const char* tz = "") :
             NumericVector(n) {
             setClass(tz);