[Rcpp-commits] r2773 - in pkg/Rcpp: inst/include/Rcpp inst/include/Rcpp/module src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Sun Dec 12 09:52:56 CET 2010


Author: romain
Date: 2010-12-12 09:52:56 +0100 (Sun, 12 Dec 2010)
New Revision: 2773

Modified:
   pkg/Rcpp/inst/include/Rcpp/Module.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Constructor.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppFunction.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppMethod.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Pointer_CppMethod.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_ctor_signature.h
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_get_signature.h
   pkg/Rcpp/src/Module.cpp
Log:
reusing strings

Modified: pkg/Rcpp/inst/include/Rcpp/Module.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/Module.h	2010-12-12 08:52:20 UTC (rev 2772)
+++ pkg/Rcpp/inst/include/Rcpp/Module.h	2010-12-12 08:52:56 UTC (rev 2773)
@@ -38,7 +38,7 @@
 		virtual ~CppFunction(){} ;
 		virtual int nargs(){ return 0 ; }
 		virtual bool is_void(){ return false ; }
-		virtual const char* signature(const char* ){ return "" ; }
+		virtual void signature(std::string&, const char* ){}
 		virtual SEXP get_formals(){ return R_NilValue; }
 		
 		std::string docstring ;
@@ -168,7 +168,7 @@
 		virtual int nargs(){ return 0 ; }
 		virtual bool is_void(){ return false ; }
 		virtual bool is_const(){ return false ; }
-		virtual const char* signature(const char* name ){ return name ; }
+		virtual void signature(std::string& s, const char* name ){ s = name ; }
 } ;
 
 #include <Rcpp/module/Module_generated_ctor_signature.h>
@@ -193,7 +193,7 @@
     std::string docstring ;
     
     inline int nargs(){ return ctor->nargs() ; }
-    inline const char* signature(const std::string& class_name){ 
+    inline const SEXP signature(const std::string& class_name){ 
         return ctor->signature(class_name) ;
     }
 } ;
@@ -211,7 +211,9 @@
     inline int nargs(){ return method->nargs() ; }
     inline bool is_void(){ return method->is_void() ; }
     inline bool is_const(){ return method->is_const() ; }
-    inline const char* signature(const char* name){ return method->signature(name); }
+    inline void signature(std::string& s, const char* name){ 
+        method->signature(s, name);
+    }
 
 } ;
 
@@ -222,8 +224,7 @@
         field( "pointer" )       = Rcpp::XPtr< SignedConstructor<Class> >( m, false ) ;
         field( "class_pointer" ) = class_xp ;
         field( "nargs" )         = m->nargs() ;
-        std::string sign(  m->signature(class_name) ) ;
-        field( "signature" )     = sign ;
+        field( "signature" )     = m->signature(class_name) ;
         field( "docstring" )     = m->docstring ;
     }
 } ;
@@ -237,15 +238,17 @@
 	S4_CppOverloadedMethods( vec_signed_method* m, SEXP class_xp, const char* name ) : Reference( "C++OverloadedMethods" ){
         
 	    int n = m->size() ;
-        Rcpp::LogicalVector voidness( n), constness(n) ;
-        Rcpp::CharacterVector docstrings( n ), signatures(n) ;
+        Rcpp::LogicalVector voidness(n), constness(n) ;
+        Rcpp::CharacterVector docstrings(n), signatures(n) ;
         signed_method_class* met ;
+        std::string sign ;
         for( int i=0; i<n; i++){ 
             met = m->at(i) ;
             voidness[i] = met->is_void() ;
             constness[i] = met->is_const() ;
             docstrings[i] = met->docstring ;
-            signatures[i] = met->signature(name) ;
+            met->signature(sign, name) ;
+            signatures[i] = sign ;
         }
         
 	    field( "pointer" )       = Rcpp::XPtr< vec_signed_method >( m, false ) ;

Modified: pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Constructor.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Constructor.h	2010-12-12 08:52:20 UTC (rev 2772)
+++ pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Constructor.h	2010-12-12 08:52:56 UTC (rev 2773)
@@ -27,7 +27,7 @@
 public:
     virtual Class* get_new( SEXP* args, int nargs ) = 0 ;
     virtual int nargs() = 0 ;
-    virtual const char* signature(const std::string& class_name) = 0 ;
+    virtual const SEXP signature(const std::string& class_name) = 0 ;
 } ;
 
 template <typename Class>
@@ -37,7 +37,7 @@
 	return new Class() ;
     }
     virtual int nargs(){ return 0 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature(class_name) ;
     }
 } ;
@@ -47,7 +47,7 @@
         return new Class( as<U0>(args[0]) ) ;
     }
     virtual int nargs(){ return 1 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0>(class_name) ;
     }
 } ;
@@ -60,7 +60,7 @@
             ) ;
     }
     virtual int nargs(){ return 2 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0,U1>(class_name) ;
     }
 } ;
@@ -74,7 +74,7 @@
             ) ;
     }
     virtual int nargs(){ return 3 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0,U1,U2>(class_name) ;
     }
 } ;
@@ -89,7 +89,7 @@
             ) ;
     }
     virtual int nargs(){ return 4 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0,U1,U2,U3>(class_name) ;
     }
 } ;
@@ -105,7 +105,7 @@
             ) ;
     }
     virtual int nargs(){ return 5 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0,U1,U2,U3,U4>(class_name) ;
     }
 } ;
@@ -122,7 +122,7 @@
             ) ;
     }
     virtual int nargs(){ return 6 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0,U1,U2,U3,U4,U5>(class_name) ;
     }
 } ;
@@ -140,7 +140,7 @@
             ) ;
     }
     virtual int nargs(){ return 7 ; }
-    virtual const char* signature(const std::string& class_name ){
+    virtual const SEXP signature(const std::string& class_name ){
         return ctor_signature<U0,U1,U2,U3,U4,U5,U6>(class_name) ;
     }
 } ;

Modified: pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppFunction.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppFunction.h	2010-12-12 08:52:20 UTC (rev 2772)
+++ pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppFunction.h	2010-12-12 08:52:56 UTC (rev 2773)
@@ -31,7 +31,7 @@
 		}
 		
 		inline int nargs(){ return 0; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(void) ;	                    
@@ -50,7 +50,7 @@
 		
 		inline int nargs(){ return 0; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(void) ;	
@@ -66,7 +66,7 @@
 		}
 		
 		inline int nargs(){ return 0; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(void) ;	                    
@@ -85,7 +85,7 @@
 		
 		inline int nargs(){ return 0; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(void) ;	
@@ -103,7 +103,7 @@
 		}
 		
 		inline int nargs(){ return 1; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0) ;	
@@ -121,7 +121,7 @@
 		
 		inline int nargs(){ return 1; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0) ;	
@@ -141,7 +141,7 @@
 		}
 		
 		inline int nargs(){ return 1; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -162,7 +162,7 @@
 		
 		inline int nargs(){ return 1; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -183,7 +183,7 @@
 		}
 		
 		inline int nargs(){ return 2; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1) ;	
@@ -201,7 +201,7 @@
 		
 		inline int nargs(){ return 2; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1) ;	
@@ -221,7 +221,7 @@
 		}
 		
 		inline int nargs(){ return 2; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -242,7 +242,7 @@
 		
 		inline int nargs(){ return 2; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -263,7 +263,7 @@
 		}
 		
 		inline int nargs(){ return 3; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2) ;	
@@ -281,7 +281,7 @@
 		
 		inline int nargs(){ return 3; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2) ;	
@@ -301,7 +301,7 @@
 		}
 		
 		inline int nargs(){ return 3; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -322,7 +322,7 @@
 		
 		inline int nargs(){ return 3; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -343,7 +343,7 @@
 		}
 		
 		inline int nargs(){ return 4; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3) ;	
@@ -361,7 +361,7 @@
 		
 		inline int nargs(){ return 4; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3) ;	
@@ -381,7 +381,7 @@
 		}
 		
 		inline int nargs(){ return 4; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -402,7 +402,7 @@
 		
 		inline int nargs(){ return 4; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -423,7 +423,7 @@
 		}
 		
 		inline int nargs(){ return 5; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4) ;	
@@ -441,7 +441,7 @@
 		
 		inline int nargs(){ return 5; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4) ;	
@@ -461,7 +461,7 @@
 		}
 		
 		inline int nargs(){ return 5; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -482,7 +482,7 @@
 		
 		inline int nargs(){ return 5; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -503,7 +503,7 @@
 		}
 		
 		inline int nargs(){ return 6; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5) ;	
@@ -521,7 +521,7 @@
 		
 		inline int nargs(){ return 6; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5) ;	
@@ -541,7 +541,7 @@
 		}
 		
 		inline int nargs(){ return 6; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -562,7 +562,7 @@
 		
 		inline int nargs(){ return 6; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -583,7 +583,7 @@
 		}
 		
 		inline int nargs(){ return 7; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6) ;	
@@ -601,7 +601,7 @@
 		
 		inline int nargs(){ return 7; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6) ;	
@@ -621,7 +621,7 @@
 		}
 		
 		inline int nargs(){ return 7; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -642,7 +642,7 @@
 		
 		inline int nargs(){ return 7; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -663,7 +663,7 @@
 		}
 		
 		inline int nargs(){ return 8; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7) ;	
@@ -681,7 +681,7 @@
 		
 		inline int nargs(){ return 8; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7) ;	
@@ -701,7 +701,7 @@
 		}
 		
 		inline int nargs(){ return 8; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -722,7 +722,7 @@
 		
 		inline int nargs(){ return 8; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -743,7 +743,7 @@
 		}
 		
 		inline int nargs(){ return 9; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8) ;	
@@ -761,7 +761,7 @@
 		
 		inline int nargs(){ return 9; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8) ;	
@@ -781,7 +781,7 @@
 		}
 		
 		inline int nargs(){ return 9; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -802,7 +802,7 @@
 		
 		inline int nargs(){ return 9; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -823,7 +823,7 @@
 		}
 		
 		inline int nargs(){ return 10; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9) ;	
@@ -841,7 +841,7 @@
 		
 		inline int nargs(){ return 10; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9) ;	
@@ -861,7 +861,7 @@
 		}
 		
 		inline int nargs(){ return 10; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -882,7 +882,7 @@
 		
 		inline int nargs(){ return 10; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -903,7 +903,7 @@
 		}
 		
 		inline int nargs(){ return 11; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10) ;	
@@ -921,7 +921,7 @@
 		
 		inline int nargs(){ return 11; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10) ;	
@@ -941,7 +941,7 @@
 		}
 		
 		inline int nargs(){ return 11; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -962,7 +962,7 @@
 		
 		inline int nargs(){ return 11; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -983,7 +983,7 @@
 		}
 		
 		inline int nargs(){ return 12; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11) ;	
@@ -1001,7 +1001,7 @@
 		
 		inline int nargs(){ return 12; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11) ;	
@@ -1021,7 +1021,7 @@
 		}
 		
 		inline int nargs(){ return 12; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1042,7 +1042,7 @@
 		
 		inline int nargs(){ return 12; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1063,7 +1063,7 @@
 		}
 		
 		inline int nargs(){ return 13; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12) ;	
@@ -1081,7 +1081,7 @@
 		
 		inline int nargs(){ return 13; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12) ;	
@@ -1101,7 +1101,7 @@
 		}
 		
 		inline int nargs(){ return 13; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1122,7 +1122,7 @@
 		
 		inline int nargs(){ return 13; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1143,7 +1143,7 @@
 		}
 		
 		inline int nargs(){ return 14; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13) ;	
@@ -1161,7 +1161,7 @@
 		
 		inline int nargs(){ return 14; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13) ;	
@@ -1181,7 +1181,7 @@
 		}
 		
 		inline int nargs(){ return 14; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1202,7 +1202,7 @@
 		
 		inline int nargs(){ return 14; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1223,7 +1223,7 @@
 		}
 		
 		inline int nargs(){ return 15; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14) ;	
@@ -1241,7 +1241,7 @@
 		
 		inline int nargs(){ return 15; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14) ;	
@@ -1261,7 +1261,7 @@
 		}
 		
 		inline int nargs(){ return 15; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1282,7 +1282,7 @@
 		
 		inline int nargs(){ return 15; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1303,7 +1303,7 @@
 		}
 		
 		inline int nargs(){ return 16; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15) ;	
@@ -1321,7 +1321,7 @@
 		
 		inline int nargs(){ return 16; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(s, name) ; }
 		
 	private:
 		void (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15) ;	
@@ -1341,7 +1341,7 @@
 		}
 		
 		inline int nargs(){ return 16; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1362,7 +1362,7 @@
 		
 		inline int nargs(){ return 16; }
 		inline bool is_void(){ return true; }
-		const char* signature(const char* name){ return Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<void_type,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>(s, name) ; }
 		SEXP get_formals(){ return formals; }
 		
 	private:
@@ -1383,7 +1383,7 @@
 		}
 		
 		inline int nargs(){ return 17; }
-		const char* signature(const char* name){ return Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16>(name) ; }
+		inline void signature(std::string& s, const char* name){ Rcpp::signature<OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16>(s, name) ; }
 		
 	private:
 		OUT (*ptr_fun)(U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16) ;	
@@ -1401,7 +1401,7 @@
 		
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/rcpp -r 2773


More information about the Rcpp-commits mailing list