Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2018-01-09 Iñaki Ucar <i.ucar86@gmail.com>

* inst/include/Rcpp/vector/proxy.h: Improve support for NVCC, the CUDA
compiler (pull request #798, fixed issue #797)

2018-01-06 Kendon Bell <kmb56@berkeley.edu>

* src/api.cpp: Allow for compilation on ANDROID
Expand Down
2 changes: 2 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions inst/include/Rcpp/vector/proxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ namespace internal{
return *this ;
}

operator char* (){
operator char* () const {
return get() ;
}

operator SEXP(){
operator SEXP() const {
return ::Rf_mkString(get()) ;
}

Expand All @@ -125,7 +125,7 @@ namespace internal{
parent.push_back( rhs, name );
}
}
char* get(){
char* get() const {
return parent[ parent.offset(name) ];
}

Expand Down