[Rcpp-commits] r1464 - in pkg/Rcpp/inst: include/Rcpp include/Rcpp/module unitTests

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-06-07 13:50:55 +0200 (Mon, 07 Jun 2010)
New Revision: 1464

Modified:
   pkg/Rcpp/inst/include/Rcpp/Module.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_Add_Property.h
   pkg/Rcpp/inst/unitTests/runit.Module.R
Log:
some more potzntial name clashes

Modified: pkg/Rcpp/inst/include/Rcpp/Module.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Module.h	2010-06-07 11:33:55 UTC (rev 1463)
+++ pkg/Rcpp/inst/include/Rcpp/Module.h	2010-06-07 11:50:55 UTC (rev 1464)
@@ -199,14 +199,14 @@
 		END_RCPP	
 	}
 	
-	self& AddMethod( const char* name, method_class* m){
-		singleton->methods.insert( PAIR( name,m ) ) ;  
-		if( *name == '[' ) singleton->specials++ ;
+	self& AddMethod( const char* name_, method_class* m){
+		singleton->methods.insert( PAIR( name_,m ) ) ;  
+		if( *name_ == '[' ) singleton->specials++ ;
 		return *this ;
 	}
 	
-	self& AddProperty( const char* name, prop_class* p){
-		singleton->properties.insert( PROP_PAIR( name, p ) ) ;
+	self& AddProperty( const char* name_, prop_class* p){
+		singleton->properties.insert( PROP_PAIR( name_, p ) ) ;
 		return *this ;
 	}
 
@@ -255,9 +255,9 @@
 		return out ;
 	}
 	
-	SEXP getProperty( const std::string& name, SEXP object) {
+	SEXP getProperty( const std::string& name_, SEXP object) {
 	BEGIN_RCPP
-		typename PROPERTY_MAP::iterator it = properties.find( name ) ;
+		typename PROPERTY_MAP::iterator it = properties.find( name_ ) ;
 		if( it == properties.end() ){
 			throw std::range_error( "no such property" ) ; 
 		}
@@ -266,9 +266,9 @@
 	END_RCPP
 	}
 	
-	void setProperty( const std::string& name, SEXP object, SEXP value)  {
+	void setProperty( const std::string& name_, SEXP object, SEXP value)  {
 	BEGIN_RCPP
-		typename PROPERTY_MAP::iterator it = properties.find( name ) ;
+		typename PROPERTY_MAP::iterator it = properties.find( name_ ) ;
 		if( it == properties.end() ){
 			throw std::range_error( "no such property" ) ; 
 		}

Modified: pkg/Rcpp/inst/include/Rcpp/module/Module_Add_Property.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/module/Module_Add_Property.h	2010-06-07 11:33:55 UTC (rev 1463)
+++ pkg/Rcpp/inst/include/Rcpp/module/Module_Add_Property.h	2010-06-07 11:50:55 UTC (rev 1464)
@@ -23,36 +23,36 @@
 #define Rcpp_Module_Add_Property_h
 
 	template <typename PROP>
-	self& property( const char* name, PROP (Class::*GetMethod)(void) ){
-		AddProperty( name, new CppProperty_GetMethod<Class,PROP>(GetMethod) ) ;
+	self& property( const char* name_, PROP (Class::*GetMethod)(void) ){
+		AddProperty( name_, new CppProperty_GetMethod<Class,PROP>(GetMethod) ) ;
 		return *this ;
 	}
 
 	template <typename PROP>
-	self& property( const char* name, PROP (Class::*GetMethod)(void) const ){
-		AddProperty( name, new CppProperty_GetConstMethod<Class,PROP>(GetMethod) ) ;
+	self& property( const char* name_, PROP (Class::*GetMethod)(void) const ){
+		AddProperty( name_, new CppProperty_GetConstMethod<Class,PROP>(GetMethod) ) ;
 		return *this ;
 	}
 	
 	template <typename PROP>
-	self& property( const char* name, PROP (*GetMethod)(Class*) ){
-		AddProperty( name, new CppProperty_GetPointerMethod<Class,PROP>(GetMethod) ) ;
+	self& property( const char* name_, PROP (*GetMethod)(Class*) ){
+		AddProperty( name_, new CppProperty_GetPointerMethod<Class,PROP>(GetMethod) ) ;
 		return *this ;
 	}
 	
 	
 	template <typename PROP>
-	self& property( const char* name, PROP (Class::*GetMethod)(void), void (Class::*SetMethod)(PROP) ){
+	self& property( const char* name_, PROP (Class::*GetMethod)(void), void (Class::*SetMethod)(PROP) ){
 		AddProperty( 
-			name, 
+			name_, 
 			new CppProperty_GetMethod_SetMethod<Class,PROP>(GetMethod, SetMethod)
 		) ;
 		return *this ;
 	}
 	template <typename PROP>
-	self& property( const char* name, PROP (Class::*GetMethod)(void) const, void (Class::*SetMethod)(PROP) ){
+	self& property( const char* name_, PROP (Class::*GetMethod)(void) const, void (Class::*SetMethod)(PROP) ){
 		AddProperty( 
-			name, 
+			name_, 
 			new CppProperty_GetConstMethod_SetMethod<Class,PROP>(GetMethod, SetMethod)
 		) ;
 		return *this ;
@@ -60,17 +60,17 @@
 	
 	
 	template <typename PROP>
-	self& property( const char* name, PROP (Class::*GetMethod)(void), void (*SetMethod)(Class*,PROP) ){
+	self& property( const char* name_, PROP (Class::*GetMethod)(void), void (*SetMethod)(Class*,PROP) ){
 		AddProperty( 
-			name, 
+			name_, 
 			new CppProperty_GetMethod_SetPointer<Class,PROP>(GetMethod, SetMethod)
 		) ;
 		return *this ;
 	}
 	template <typename PROP>
-	self& property( const char* name, PROP (Class::*GetMethod)(void) const , void (*SetMethod)(Class*,PROP) ){
+	self& property( const char* name_, PROP (Class::*GetMethod)(void) const , void (*SetMethod)(Class*,PROP) ){
 		AddProperty( 
-			name, 
+			name_, 
 			new CppProperty_GetConstMethod_SetPointer<Class,PROP>(GetMethod, SetMethod)
 		) ;
 		return *this ;
@@ -78,17 +78,17 @@
 	
 	
 	template <typename PROP>
-	self& property( const char* name, PROP (*GetMethod)(Class*), void (Class::*SetMethod)(PROP) ){
+	self& property( const char* name_, PROP (*GetMethod)(Class*), void (Class::*SetMethod)(PROP) ){
 		AddProperty( 
-			name, 
+			name_, 
 			new CppProperty_GetPointer_SetMethod<Class,PROP>(GetMethod, SetMethod)
 		) ;
 	}
 
 	template <typename PROP>
-	self& property( const char* name, PROP (*GetMethod)(Class*), void (*SetMethod)(Class*,PROP) ){
+	self& property( const char* name_, PROP (*GetMethod)(Class*), void (*SetMethod)(Class*,PROP) ){
 		AddProperty( 
-			name, 
+			name_, 
 			new CppProperty_GetPointer_SetPointer<Class,PROP>(GetMethod, SetMethod)
 		) ;
 		return *this ;

Modified: pkg/Rcpp/inst/unitTests/runit.Module.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.Module.R	2010-06-07 11:33:55 UTC (rev 1463)
+++ pkg/Rcpp/inst/unitTests/runit.Module.R	2010-06-07 11:50:55 UTC (rev 1464)
@@ -18,7 +18,7 @@
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
 if( Rcpp:::capabilities()[["Rcpp modules"]] ) {
-	
+
 test.Module <- function(){
 
 	inc  <- '
@@ -101,7 +101,8 @@
     
 }
 
-
+# hide this one for now (suncc not happy about overloads)
+if(FALSE){
 test.Module.stdvec <- function(){
 
 code <- ''
@@ -162,6 +163,7 @@
 	checkEquals( v$as.vector(), c(1:10, 10 ) )
 	
 }
+}
 
 test.Module.property <- function(){