Merge pull request #559 from RcppCore/bugfix/datetime_int_ops

operator+ for int argument (closes #558)

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2016-10-19  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/include/Rcpp/date_datetime/Datetime.h (Rcpp): Additional
+        operator+ for int argument
+
 2016-10-18  Dirk Eddelbuettel  <[email protected]>
 
         * inst/include/Rcpp/date_datetime/Date.h (Rcpp): Add operator double()

inst/include/Rcpp/date_datetime/Datetime.h

@@ -2,7 +2,7 @@
 //
 // Datetime.h: Rcpp R/C++ interface class library -- Datetime (POSIXct)
 //
-// Copyright (C) 2010 - 2015  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2016  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -55,6 +55,7 @@ namespace Rcpp {
 
         // Minimal set of date operations.
         friend Datetime  operator+( const Datetime &dt, double offset);
+        friend Datetime  operator+( const Datetime &dt, int offset);
         friend double    operator-( const Datetime &dt1, const Datetime& dt2);
         friend bool      operator<( const Datetime &dt1, const Datetime& dt2);
         friend bool      operator>( const Datetime &dt1, const Datetime& dt2);
@@ -114,6 +115,15 @@ namespace Rcpp {
         return newdt;
     }
 
+    inline Datetime operator+(const Datetime &datetime, int offset) {
+        Datetime newdt(datetime.m_dt);
+        newdt.m_dt += offset;
+        time_t t = static_cast<time_t>(std::floor(newdt.m_dt));
+        newdt.m_tm = *gmtime_(&t);
+        newdt.m_us = static_cast<int>(::Rf_fround( (newdt.m_dt - t) * 1.0e6, 0.0));
+        return newdt;
+    }
+
     inline double  operator-(const Datetime& d1, const Datetime& d2) { return d1.m_dt - d2.m_dt; }
     inline bool    operator<(const Datetime &d1, const Datetime& d2) { return d1.m_dt < d2.m_dt; }
     inline bool    operator>(const Datetime &d1, const Datetime& d2) { return d1.m_dt > d2.m_dt; }