[Rcpp-commits] r3818 - in pkg/Rcpp: . inst/include/Rcpp/module

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Oct 23 16:10:58 CEST 2012


Author: romain
Date: 2012-10-23 16:10:57 +0200 (Tue, 23 Oct 2012)
New Revision: 3818

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppMethod.h
Log:
simpler version

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-10-23 14:09:04 UTC (rev 3817)
+++ pkg/Rcpp/ChangeLog	2012-10-23 14:10:57 UTC (rev 3818)
@@ -1,7 +1,8 @@
 2012-10-23  Romain Francois <romain at r-enthusiasts.com>
 
         * include/Rcpp/internal/wrap.h: new function module_wrap used internally by modules
-        * include/Rcpp/module/Module_generated_CppMethod.h: using module_wrap
+        * include/Rcpp/module/Module_generated_CppMethod.h: using module_wrap and
+        simplified the code (removing 35% of the generated code now rendered useless)
 
 2012-10-22  Romain Francois <romain at r-enthusiasts.com>
 

Modified: pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppMethod.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppMethod.h	2012-10-23 14:09:04 UTC (rev 3817)
+++ pkg/Rcpp/inst/include/Rcpp/module/Module_generated_CppMethod.h	2012-10-23 14:10:57 UTC (rev 3818)
@@ -57,28 +57,6 @@
 		Method met ;
 	} ;
 	
-	template <typename Class, typename T> 
-	class CppMethod0< Class, result<T> > : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(void) ;
-		typedef CppMethod<Class> method_class ;
-		typedef XPtr<T> XP ;
-		CppMethod0( Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* ){
-		    T* ptr = (object->*met)( ) ;
-			return internal::make_new_object<T>(ptr) ; 
-		}
-		inline int nargs(){ return 0 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name){ Rcpp::signature< result<T> >(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-
-	
 	template <typename Class, typename OUT> class const_CppMethod0 : public CppMethod<Class> {
 	public:
 		typedef OUT (Class::*Method)(void) const ;
@@ -114,27 +92,6 @@
 		Method met ;
 	} ;
 
-	template <typename Class, typename T> 
-	class const_CppMethod0< Class, result<T> > : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(void) const ;
-		typedef CppMethod<Class> method_class ;
-		typedef XPtr<T> XP ;
-		const_CppMethod0( Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* ){
-		    T* ptr = (object->*met)( ) ;
-			return internal::make_new_object<T>(ptr) ; 
-		}
-		inline int nargs(){ return 0 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name){ Rcpp::signature< result<T> >(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
 
 
 	template < typename Class, typename OUT, typename U0 > class CppMethod1 : public CppMethod<Class> {
@@ -154,28 +111,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0 >
-	class CppMethod1 <Class, result<T>, U0> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod1(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 1 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0 > class CppMethod1<Class,void,U0> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0) ;
@@ -215,27 +151,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0 > 
-	class const_CppMethod1 <Class, result<T>, U0> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod1(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 1 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0 > class const_CppMethod1<Class,void,U0> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0) const ;
@@ -275,28 +191,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1 >
-	class CppMethod2 <Class, result<T>, U0, U1> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod2(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 2 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1 > class CppMethod2<Class,void,U0, U1> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1) ;
@@ -336,27 +231,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1 > 
-	class const_CppMethod2 <Class, result<T>, U0, U1> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod2(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 2 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1 > class const_CppMethod2<Class,void,U0, U1> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1) const ;
@@ -396,28 +271,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2 >
-	class CppMethod3 <Class, result<T>, U0, U1, U2> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod3(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 3 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2 > class CppMethod3<Class,void,U0, U1, U2> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2) ;
@@ -457,27 +311,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2 > 
-	class const_CppMethod3 <Class, result<T>, U0, U1, U2> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod3(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 3 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2 > class const_CppMethod3<Class,void,U0, U1, U2> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2) const ;
@@ -517,28 +351,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3 >
-	class CppMethod4 <Class, result<T>, U0, U1, U2, U3> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod4(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 4 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3 > class CppMethod4<Class,void,U0, U1, U2, U3> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3) ;
@@ -578,27 +391,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3 > 
-	class const_CppMethod4 <Class, result<T>, U0, U1, U2, U3> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod4(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 4 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2, typename U3 > class const_CppMethod4<Class,void,U0, U1, U2, U3> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3) const ;
@@ -638,28 +431,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4 >
-	class CppMethod5 <Class, result<T>, U0, U1, U2, U3, U4> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod5(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 5 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4 > class CppMethod5<Class,void,U0, U1, U2, U3, U4> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4) ;
@@ -699,27 +471,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4 > 
-	class const_CppMethod5 <Class, result<T>, U0, U1, U2, U3, U4> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod5(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 5 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4 > class const_CppMethod5<Class,void,U0, U1, U2, U3, U4> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4) const ;
@@ -759,28 +511,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5 >
-	class CppMethod6 <Class, result<T>, U0, U1, U2, U3, U4, U5> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod6(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 6 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5 > class CppMethod6<Class,void,U0, U1, U2, U3, U4, U5> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5) ;
@@ -820,27 +551,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5 > 
-	class const_CppMethod6 <Class, result<T>, U0, U1, U2, U3, U4, U5> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod6(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 6 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5 > class const_CppMethod6<Class,void,U0, U1, U2, U3, U4, U5> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5) const ;
@@ -880,28 +591,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 >
-	class CppMethod7 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod7(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 7 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > class CppMethod7<Class,void,U0, U1, U2, U3, U4, U5, U6> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6) ;
@@ -941,27 +631,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > 
-	class const_CppMethod7 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod7(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 7 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6 > class const_CppMethod7<Class,void,U0, U1, U2, U3, U4, U5, U6> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6) const ;
@@ -1001,28 +671,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7 >
-	class CppMethod8 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6, U7> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod8(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U7 >::type >( args[7] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 8 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6, U7>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7 > class CppMethod8<Class,void,U0, U1, U2, U3, U4, U5, U6, U7> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7) ;
@@ -1062,27 +711,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7 > 
-	class const_CppMethod8 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6, U7> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod8(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U7 >::type >( args[7] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 8 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6, U7>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7 > class const_CppMethod8<Class,void,U0, U1, U2, U3, U4, U5, U6, U7> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7) const ;
@@ -1122,28 +751,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8 >
-	class CppMethod9 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6, U7, U8> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod9(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U7 >::type >( args[7] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U8 >::type >( args[8] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 9 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6, U7, U8>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8 > class CppMethod9<Class,void,U0, U1, U2, U3, U4, U5, U6, U7, U8> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8) ;
@@ -1183,27 +791,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8 > 
-	class const_CppMethod9 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6, U7, U8> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8) const ;
-		typedef CppMethod<Class> method_class ;
 		
-		const_CppMethod9(Method m) : method_class(), met(m){} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U7 >::type >( args[7] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U8 >::type >( args[8] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 9 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return true ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6, U7, U8>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8 > class const_CppMethod9<Class,void,U0, U1, U2, U3, U4, U5, U6, U7, U8> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8) const ;
@@ -1243,28 +831,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9 >
-	class CppMethod10 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6, U7, U8, U9> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9) ;
-		typedef CppMethod<Class> method_class ;
-		
-		CppMethod10(Method m) : method_class(), met(m) {} 
-		SEXP operator()( Class* object, SEXP* args){
-		    T* ptr = (object->*met)( Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U0 >::type >( args[0] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U1 >::type >( args[1] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U2 >::type >( args[2] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U3 >::type >( args[3] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U4 >::type >( args[4] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U5 >::type >( args[5] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U6 >::type >( args[6] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U7 >::type >( args[7] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U8 >::type >( args[8] ), Rcpp::as< typename Rcpp::traits::remove_const_and_reference< U9 >::type >( args[9] ) ) ;
-			return internal::make_new_object<T>(ptr) ;
-		}
-		inline int nargs(){ return 10 ; }
-		inline bool is_void(){ return false ; }
-		inline bool is_const(){ return false ; }
-		inline void signature(std::string& s, const char* name ){ Rcpp::signature<result<T>,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>(s, name) ; }
-		
-	private:
-		Method met ;
-	} ;
-	
-	
+
 	template < typename Class, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9 > class CppMethod10<Class,void,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9> : public CppMethod<Class> {
 	public:
 		typedef void (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9) ;
@@ -1304,27 +871,7 @@
 	private:
 		Method met ;
 	} ;
-	
-	template < typename Class, typename T, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9 > 
-	class const_CppMethod10 <Class, result<T>, U0, U1, U2, U3, U4, U5, U6, U7, U8, U9> : public CppMethod<Class> {
-	public:
-		typedef result<T> (Class::*Method)(U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9) const ;
[TRUNCATED]

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


More information about the Rcpp-commits mailing list