Skip to content

Commit 274c23f

Browse files
committed
fixes a small 'thinko'
only whitespace in newDateVector rolls minor version updates debian/changelog
1 parent 327d057 commit 274c23f

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2016-11-22 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Date, Version): roll minor version
4+
5+
* inst/include/Rcpp/date_datetime/newDatetimeVector.h (Rcpp): Small
6+
correction concerning timezone attribute to ctor from RTYPE
7+
18
2016-11-16 Dirk Eddelbuettel <[email protected]>
29

310
* DESCRIPTION: Release 0.12.8

DESCRIPTION

Lines changed: 2 additions & 2 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: 0.12.8
4-
Date: 2016-11-16
3+
Version: 0.12.8.1
4+
Date: 2016-11-22
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]>

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
rcpp (0.12.8-1) unstable; urgency=medium
2+
3+
* New upstream release
4+
5+
-- Dirk Eddelbuettel <[email protected]> Fri, 18 Nov 2016 06:19:40 -0600
6+
17
rcpp (0.12.7-1) unstable; urgency=medium
28

39
* New upstream release

inst/include/Rcpp/date_datetime/newDateVector.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ namespace Rcpp {
4343
v[i] = (*this)[i];
4444
return v;
4545
}
46-
46+
4747
inline newDateVector &operator=(const newDateVector &rhs) {
4848
if (this != &rhs) {
4949
NumericVector::operator=(rhs);
5050
}
51-
51+
5252
return *this;
5353
}
5454

inst/include/Rcpp/date_datetime/newDatetimeVector.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ namespace Rcpp {
2929
class newDatetimeVector : public NumericVector {
3030
public:
3131
template <int RTYPE, bool NA, typename VEC>
32-
newDatetimeVector(const VectorBase<RTYPE,NA,VEC>& other) :
32+
newDatetimeVector(const VectorBase<RTYPE,NA,VEC>& other, const char* tz = "") :
3333
NumericVector(other) {
34-
setClass(other.attr("tzone"));
34+
setClass(tz);
3535
}
3636

3737
newDatetimeVector(SEXP vec, const char* tz = "") :
@@ -51,13 +51,13 @@ namespace Rcpp {
5151
v[i] = (*this)[i];
5252
return v;
5353
}
54-
54+
5555
inline newDatetimeVector &operator=(const newDatetimeVector &rhs) {
5656
if (this != &rhs) {
5757
NumericVector::operator=(rhs);
5858
this->attr("tzone") = rhs.attr("tzone");
5959
}
60-
60+
6161
return *this;
6262
}
6363

0 commit comments

Comments
 (0)