From 85a9536456b424ded3dd7a06b273c8fb05d678bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Tue, 9 Jan 2018 22:40:40 +0100 Subject: [PATCH 1/2] fix nvcc error --- inst/include/Rcpp/vector/proxy.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/include/Rcpp/vector/proxy.h b/inst/include/Rcpp/vector/proxy.h index 31c457fda..093e8370d 100644 --- a/inst/include/Rcpp/vector/proxy.h +++ b/inst/include/Rcpp/vector/proxy.h @@ -100,11 +100,11 @@ namespace internal{ return *this ; } - operator char* (){ + operator char* () const { return get() ; } - operator SEXP(){ + operator SEXP() const { return ::Rf_mkString(get()) ; } @@ -125,7 +125,7 @@ namespace internal{ parent.push_back( rhs, name ); } } - char* get(){ + char* get() const { return parent[ parent.offset(name) ]; } From 5c1b45fe7f6dc8077ee6d780c86f59f9060494c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Tue, 9 Jan 2018 23:41:53 +0100 Subject: [PATCH 2/2] update ChangeLog & NEWS --- ChangeLog | 5 +++++ inst/NEWS.Rd | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index d69f9a25f..fc35f8eb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-09 Iñaki Ucar + + * inst/include/Rcpp/vector/proxy.h: Improve support for NVCC, the CUDA + compiler (pull request #798, fixed issue #797) + 2018-01-06 Kendon Bell * src/api.cpp: Allow for compilation on ANDROID diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index cb41efe6c..29264dc62 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -34,6 +34,8 @@ \item Overly picky \emph{fall-through} warnings by gcc-7 regarding \code{switch} statements are now pre-empted (Kirill in \ghpr{792}). \item Permit compilation on ANDROID (Kenny Bell in \ghpr{796}). + \item Improve support for NVCC, the CUDA compiler (Iñaki Ucar in + \ghpr{798} addressing \ghit{797}). } \item Changes in Rcpp Attributes: \itemize{