Skip to content

Commit 469da1c

Browse files
authored
Merge pull request #798 from Enchufa2/nvcc-compatibility
close #797: improve support for NVCC
2 parents 40e5d66 + 5c1b45f commit 469da1c

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2018-01-09 Iñaki Ucar <[email protected]>
2+
3+
* inst/include/Rcpp/vector/proxy.h: Improve support for NVCC, the CUDA
4+
compiler (pull request #798, fixed issue #797)
5+
16
2018-01-06 Kendon Bell <[email protected]>
27

38
* src/api.cpp: Allow for compilation on ANDROID

inst/NEWS.Rd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
\item Overly picky \emph{fall-through} warnings by gcc-7 regarding
3535
\code{switch} statements are now pre-empted (Kirill in \ghpr{792}).
3636
\item Permit compilation on ANDROID (Kenny Bell in \ghpr{796}).
37+
\item Improve support for NVCC, the CUDA compiler (Iñaki Ucar in
38+
\ghpr{798} addressing \ghit{797}).
3739
}
3840
\item Changes in Rcpp Attributes:
3941
\itemize{

inst/include/Rcpp/vector/proxy.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ namespace internal{
100100
return *this ;
101101
}
102102

103-
operator char* (){
103+
operator char* () const {
104104
return get() ;
105105
}
106106

107-
operator SEXP(){
107+
operator SEXP() const {
108108
return ::Rf_mkString(get()) ;
109109
}
110110

@@ -125,7 +125,7 @@ namespace internal{
125125
parent.push_back( rhs, name );
126126
}
127127
}
128-
char* get(){
128+
char* get() const {
129129
return parent[ parent.offset(name) ];
130130
}
131131

0 commit comments

Comments
 (0)