Skip to content

Commit 0a43747

Browse files
committed
Merge pull request #301 from romainfrancois/master
Safer `DataFrame(SEXP)` ctor
2 parents 3eb1894 + b9767de commit 0a43747

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

inst/include/Rcpp/DataFrame.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// DataFrame.h: Rcpp R/C++ interface class library -- data frames
44
//
5-
// Copyright (C) 2010 - 2014 Dirk Eddelbuettel and Romain Francois
5+
// Copyright (C) 2010 - 2015 Dirk Eddelbuettel and Romain Francois
66
//
77
// This file is part of Rcpp.
88
//
@@ -40,7 +40,7 @@ namespace Rcpp{
4040
typedef Vector<VECSXP, StoragePolicy> Parent ;
4141

4242
DataFrame_Impl() : Parent( internal::empty_data_frame() ){}
43-
DataFrame_Impl(SEXP x) {
43+
DataFrame_Impl(SEXP x) : Parent(x) {
4444
set__(x);
4545
}
4646
DataFrame_Impl( const DataFrame_Impl& other){

inst/include/Rcpp/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#define RCPP_VERSION Rcpp_Version(0,11,6)
3131

3232
// the current source snapshot
33-
#define RCPP_DEV_VERSION RcppDevVersion(0,11,6,0)
33+
#define RCPP_DEV_VERSION RcppDevVersion(0,11,6,1)
3434

3535
#endif
3636

0 commit comments

Comments
 (0)