[Rcpp-commits] r1534 - scripts

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

Author: romain
Date: 2010-06-14 15:20:17 +0200 (Mon, 14 Jun 2010)
New Revision: 1534

Modified:
   scripts/generator_Module_Pointer_method.R
   scripts/generator_Module_function.R
   scripts/generator_Module_method.R
Log:
forgot to commit these

Modified: scripts/generator_Module_Pointer_method.R
===================================================================
--- scripts/generator_Module_Pointer_method.R	2010-06-14 13:13:32 UTC (rev 1533)
+++ scripts/generator_Module_Pointer_method.R	2010-06-14 13:20:17 UTC (rev 1534)
@@ -13,8 +13,8 @@
 txt <- sprintf( '
 
 	template <typename OUT, %s>
-	self& method( const char* name, OUT (*fun)(Class*, %s) ){
-		AddMethod( name, new Pointer_CppMethod%d<Class,OUT,%s>( fun ) ) ;
+	self& method( const char* name_, OUT (*fun)(Class*, %s) ){
+		AddMethod( name_, new Pointer_CppMethod%d<Class,OUT,%s>( fun ) ) ;
   		return *this ;
 	}
 	
@@ -55,8 +55,8 @@
 #define Rcpp_Module_generated_Pointer_method_h
 
 	template <typename OUT>
-	self& method( const char* name, OUT (*fun)(Class*) ){
-		AddMethod( name, new Pointer_CppMethod0<Class,OUT>( fun ) ) ;
+	self& method( const char* name_, OUT (*fun)(Class*) ){
+		AddMethod( name_, new Pointer_CppMethod0<Class,OUT>( fun ) ) ;
   		return *this ;
 	}
 	

Modified: scripts/generator_Module_function.R
===================================================================
--- scripts/generator_Module_function.R	2010-06-14 13:13:32 UTC (rev 1533)
+++ scripts/generator_Module_function.R	2010-06-14 13:20:17 UTC (rev 1534)
@@ -3,10 +3,10 @@
 	
 txt <- sprintf( '
 template <typename OUT%s>                                                                   
-void function( const char* name,  OUT (*fun)(%s)){
+void function( const char* name_,  OUT (*fun)(%s)){
   Rcpp::Module* scope = ::getCurrentScope() ;
   if( scope ){
-    scope->Add( name, new CppFunction%d<OUT%s>( fun ) ) ;
+    scope->Add( name_, new CppFunction%d<OUT%s>( fun ) ) ;
   }
 }
 ', 

Modified: scripts/generator_Module_method.R
===================================================================
--- scripts/generator_Module_method.R	2010-06-14 13:13:32 UTC (rev 1533)
+++ scripts/generator_Module_method.R	2010-06-14 13:20:17 UTC (rev 1534)
@@ -13,26 +13,26 @@
 txt <- sprintf( '
 
 	template <typename OUT, %s>
-	self& method( const char* name, OUT (Class::*fun)(%s) ){
-		AddMethod( name, new CppMethod%d<Class,OUT,%s>( fun ) ) ;
+	self& method( const char* name_, OUT (Class::*fun)(%s) ){
+		AddMethod( name_, new CppMethod%d<Class,OUT,%s>( fun ) ) ;
   		return *this ;
 	}
 	
 	template <typename OUT, %s>
-	self& method( const char* name, OUT (Class::*fun)(%s) const ){
-		AddMethod( name, new const_CppMethod%d<Class,OUT,%s>( fun ) ) ;
+	self& method( const char* name_, OUT (Class::*fun)(%s) const ){
+		AddMethod( name_, new const_CppMethod%d<Class,OUT,%s>( fun ) ) ;
   		return *this ;
 	}
 
 	template <typename OUT, %s>
-	self& nonconst_method( const char* name, OUT (Class::*fun)(%s) ){
-		AddMethod( name, new CppMethod%d<Class,OUT,%s>( fun ) ) ;
+	self& nonconst_method( const char* name_, OUT (Class::*fun)(%s) ){
+		AddMethod( name_, new CppMethod%d<Class,OUT,%s>( fun ) ) ;
   		return *this ;
 	}
 	
 	template <typename OUT, %s>
-	self& const_method( const char* name, OUT (Class::*fun)(%s) const ){
-		AddMethod( name, new const_CppMethod%d<Class,OUT,%s>( fun ) ) ;
+	self& const_method( const char* name_, OUT (Class::*fun)(%s) const ){
+		AddMethod( name_, new const_CppMethod%d<Class,OUT,%s>( fun ) ) ;
   		return *this ;
 	}
 
@@ -87,26 +87,26 @@
 #define Rcpp_Module_generated_method_h
 
 	template <typename OUT>
-	self& method( const char* name, OUT (Class::*fun)(void) ){
-		AddMethod( name, new CppMethod0<Class,OUT>( fun ) ) ;
+	self& method( const char* name_, OUT (Class::*fun)(void) ){
+		AddMethod( name_, new CppMethod0<Class,OUT>( fun ) ) ;
   		return *this ;
 	}
 	
 	template <typename OUT>
-	self& method( const char* name, OUT (Class::*fun)(void) const ){
-		AddMethod( name, new const_CppMethod0<Class,OUT>( fun ) ) ;
+	self& method( const char* name_, OUT (Class::*fun)(void) const ){
+		AddMethod( name_, new const_CppMethod0<Class,OUT>( fun ) ) ;
   		return *this ;
 	}
 
 	
 	template <typename OUT>
-	self& nonconst_method( const char* name, OUT (Class::*fun)(void) ){
-		AddMethod( name, new CppMethod0<Class,OUT>( fun ) ) ;
+	self& nonconst_method( const char* name_, OUT (Class::*fun)(void) ){
+		AddMethod( name_, new CppMethod0<Class,OUT>( fun ) ) ;
   		return *this ;
 	}
 	template <typename OUT>
-	self& const_method( const char* name, OUT (Class::*fun)(void) const ){
-		AddMethod( name, new const_CppMethod0<Class,OUT>( fun ) ) ;
+	self& const_method( const char* name_, OUT (Class::*fun)(void) const ){
+		AddMethod( name_, new const_CppMethod0<Class,OUT>( fun ) ) ;
   		return *this ;
 	}