Skip to content

Commit 70c67dd

Browse files
committed
Don't mask 'name' member and appease Solaris (#108)
1 parent 5da7719 commit 70c67dd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

inst/include/Rcpp/module/Module.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,18 @@ namespace Rcpp {
152152
* The R code in Module.R uses this information to create a C++Function
153153
* object
154154
*/
155-
inline SEXP get_function( const std::string& name ){
155+
inline SEXP get_function( const std::string& name_ ){
156156
MAP::iterator it = functions.begin() ;
157157
int n = functions.size() ;
158158
CppFunction* fun = 0 ;
159159
for( int i=0; i<n; i++, ++it){
160-
if( name.compare( it->first ) == 0){
160+
if( name_.compare( it->first ) == 0){
161161
fun = it->second ;
162162
break ;
163163
}
164164
}
165165
std::string sign ;
166-
fun->signature( sign, name.data() ) ;
166+
fun->signature( sign, name_.data() ) ;
167167
return List::create(
168168
XPtr<CppFunction>( fun, false ),
169169
fun->is_void(),
@@ -177,12 +177,12 @@ namespace Rcpp {
177177
/**
178178
* get the underlying C++ function pointer as a DL_FUNC
179179
*/
180-
inline DL_FUNC get_function_ptr( const std::string& name ){
180+
inline DL_FUNC get_function_ptr( const std::string& name_ ){
181181
MAP::iterator it = functions.begin() ;
182182
int n = functions.size() ;
183183
CppFunction* fun = 0 ;
184184
for( int i=0; i<n; i++, ++it){
185-
if( name.compare( it->first ) == 0){
185+
if( name_.compare( it->first ) == 0){
186186
fun = it->second ;
187187
break ;
188188
}

0 commit comments

Comments
 (0)