[Rcpp-commits] r2485 - in pkg/Rcpp: . inst/include/Rcpp/module
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sun Nov 21 23:51:44 CET 2010
Author: romain
Date: 2010-11-21 23:51:44 +0100 (Sun, 21 Nov 2010)
New Revision: 2485
Modified:
pkg/Rcpp/ChangeLog
pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Pointer_method.h
pkg/Rcpp/inst/include/Rcpp/module/Module_generated_method.h
Log:
added docstring
Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog 2010-11-21 22:48:09 UTC (rev 2484)
+++ pkg/Rcpp/ChangeLog 2010-11-21 22:51:44 UTC (rev 2485)
@@ -11,6 +11,12 @@
are directly applied to the .constructor function
* inst/include/Rcpp/module/Module_generated_Constructor.h: removed init_*
+
+ * inst/include/Rcpp/module/Module_generated_method.h: .method gains a docstring
+ argument to allow self documentation of exposed methods
+
+ * inst/include/Rcpp/module/Module_generated_PointerMethod.h: idem
+
2010-11-20 John M Chambers <jmc at r-project.org>
Modified: pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Pointer_method.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Pointer_method.h 2010-11-21 22:48:09 UTC (rev 2484)
+++ pkg/Rcpp/inst/include/Rcpp/module/Module_generated_Pointer_method.h 2010-11-21 22:51:44 UTC (rev 2485)
@@ -23,8 +23,8 @@
#define Rcpp_Module_generated_Pointer_method_h
template <typename OUT>
- self& method( const char* name_, OUT (*fun)(Class*), ValidMethod valid = &yes ){
- AddMethod( name_, new Pointer_CppMethod0<Class,OUT>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*), const char* docstring = 0, ValidMethod valid = &yes ){
+ AddMethod( name_, new Pointer_CppMethod0<Class,OUT>( fun ), valid, docstring ) ;
return *this ;
}
@@ -32,8 +32,8 @@
template <typename OUT, typename U0>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0), ValidMethod valid = &yes_arity<1> ){
- AddMethod( name_, new Pointer_CppMethod1<Class,OUT,U0>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0), const char* docstring = 0, ValidMethod valid = &yes_arity<1> ){
+ AddMethod( name_, new Pointer_CppMethod1<Class,OUT,U0>( fun ), valid, docstring ) ;
return *this ;
}
@@ -42,8 +42,8 @@
template <typename OUT, typename U0, typename U1>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1), ValidMethod valid = &yes_arity<2> ){
- AddMethod( name_, new Pointer_CppMethod2<Class,OUT,U0, U1>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1), const char* docstring = 0, ValidMethod valid = &yes_arity<2> ){
+ AddMethod( name_, new Pointer_CppMethod2<Class,OUT,U0, U1>( fun ), valid, docstring ) ;
return *this ;
}
@@ -52,8 +52,8 @@
template <typename OUT, typename U0, typename U1, typename U2>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2), ValidMethod valid = &yes_arity<3> ){
- AddMethod( name_, new Pointer_CppMethod3<Class,OUT,U0, U1, U2>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2), const char* docstring = 0, ValidMethod valid = &yes_arity<3> ){
+ AddMethod( name_, new Pointer_CppMethod3<Class,OUT,U0, U1, U2>( fun ), valid, docstring ) ;
return *this ;
}
@@ -62,8 +62,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3), ValidMethod valid = &yes_arity<4> ){
- AddMethod( name_, new Pointer_CppMethod4<Class,OUT,U0, U1, U2, U3>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3), const char* docstring = 0, ValidMethod valid = &yes_arity<4> ){
+ AddMethod( name_, new Pointer_CppMethod4<Class,OUT,U0, U1, U2, U3>( fun ), valid, docstring ) ;
return *this ;
}
@@ -72,8 +72,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4), ValidMethod valid = &yes_arity<5> ){
- AddMethod( name_, new Pointer_CppMethod5<Class,OUT,U0, U1, U2, U3, U4>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4), const char* docstring = 0, ValidMethod valid = &yes_arity<5> ){
+ AddMethod( name_, new Pointer_CppMethod5<Class,OUT,U0, U1, U2, U3, U4>( fun ), valid, docstring ) ;
return *this ;
}
@@ -82,8 +82,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5), ValidMethod valid = &yes_arity<6> ){
- AddMethod( name_, new Pointer_CppMethod6<Class,OUT,U0, U1, U2, U3, U4, U5>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5), const char* docstring = 0, ValidMethod valid = &yes_arity<6> ){
+ AddMethod( name_, new Pointer_CppMethod6<Class,OUT,U0, U1, U2, U3, U4, U5>( fun ), valid, docstring ) ;
return *this ;
}
@@ -92,8 +92,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6), ValidMethod valid = &yes_arity<7> ){
- AddMethod( name_, new Pointer_CppMethod7<Class,OUT,U0, U1, U2, U3, U4, U5, U6>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6), const char* docstring = 0, ValidMethod valid = &yes_arity<7> ){
+ AddMethod( name_, new Pointer_CppMethod7<Class,OUT,U0, U1, U2, U3, U4, U5, U6>( fun ), valid, docstring ) ;
return *this ;
}
@@ -102,8 +102,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7), ValidMethod valid = &yes_arity<8> ){
- AddMethod( name_, new Pointer_CppMethod8<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7), const char* docstring = 0, ValidMethod valid = &yes_arity<8> ){
+ AddMethod( name_, new Pointer_CppMethod8<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7>( fun ), valid, docstring ) ;
return *this ;
}
@@ -112,8 +112,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8), ValidMethod valid = &yes_arity<9> ){
- AddMethod( name_, new Pointer_CppMethod9<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8), const char* docstring = 0, ValidMethod valid = &yes_arity<9> ){
+ AddMethod( name_, new Pointer_CppMethod9<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8>( fun ), valid, docstring ) ;
return *this ;
}
@@ -122,8 +122,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9), ValidMethod valid = &yes_arity<10> ){
- AddMethod( name_, new Pointer_CppMethod10<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9), const char* docstring = 0, ValidMethod valid = &yes_arity<10> ){
+ AddMethod( name_, new Pointer_CppMethod10<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9>( fun ), valid, docstring ) ;
return *this ;
}
@@ -132,8 +132,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10), ValidMethod valid = &yes_arity<11> ){
- AddMethod( name_, new Pointer_CppMethod11<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10), const char* docstring = 0, ValidMethod valid = &yes_arity<11> ){
+ AddMethod( name_, new Pointer_CppMethod11<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10>( fun ), valid, docstring ) ;
return *this ;
}
@@ -142,8 +142,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11), ValidMethod valid = &yes_arity<12> ){
- AddMethod( name_, new Pointer_CppMethod12<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11), const char* docstring = 0, ValidMethod valid = &yes_arity<12> ){
+ AddMethod( name_, new Pointer_CppMethod12<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11>( fun ), valid, docstring ) ;
return *this ;
}
@@ -152,8 +152,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12), ValidMethod valid = &yes_arity<13> ){
- AddMethod( name_, new Pointer_CppMethod13<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12), const char* docstring = 0, ValidMethod valid = &yes_arity<13> ){
+ AddMethod( name_, new Pointer_CppMethod13<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12>( fun ), valid, docstring ) ;
return *this ;
}
@@ -162,8 +162,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13), ValidMethod valid = &yes_arity<14> ){
- AddMethod( name_, new Pointer_CppMethod14<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13), const char* docstring = 0, ValidMethod valid = &yes_arity<14> ){
+ AddMethod( name_, new Pointer_CppMethod14<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13>( fun ), valid, docstring ) ;
return *this ;
}
@@ -172,8 +172,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14), ValidMethod valid = &yes_arity<15> ){
- AddMethod( name_, new Pointer_CppMethod15<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14), const char* docstring = 0, ValidMethod valid = &yes_arity<15> ){
+ AddMethod( name_, new Pointer_CppMethod15<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14>( fun ), valid, docstring ) ;
return *this ;
}
@@ -182,8 +182,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15), ValidMethod valid = &yes_arity<16> ){
- AddMethod( name_, new Pointer_CppMethod16<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15), const char* docstring = 0, ValidMethod valid = &yes_arity<16> ){
+ AddMethod( name_, new Pointer_CppMethod16<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15>( fun ), valid, docstring ) ;
return *this ;
}
@@ -192,8 +192,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16), ValidMethod valid = &yes_arity<17> ){
- AddMethod( name_, new Pointer_CppMethod17<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16), const char* docstring = 0, ValidMethod valid = &yes_arity<17> ){
+ AddMethod( name_, new Pointer_CppMethod17<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16>( fun ), valid, docstring ) ;
return *this ;
}
@@ -202,8 +202,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17), ValidMethod valid = &yes_arity<18> ){
- AddMethod( name_, new Pointer_CppMethod18<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17), const char* docstring = 0, ValidMethod valid = &yes_arity<18> ){
+ AddMethod( name_, new Pointer_CppMethod18<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17>( fun ), valid, docstring ) ;
return *this ;
}
@@ -212,8 +212,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18), ValidMethod valid = &yes_arity<19> ){
- AddMethod( name_, new Pointer_CppMethod19<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18), const char* docstring = 0, ValidMethod valid = &yes_arity<19> ){
+ AddMethod( name_, new Pointer_CppMethod19<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18>( fun ), valid, docstring ) ;
return *this ;
}
@@ -222,8 +222,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19), ValidMethod valid = &yes_arity<20> ){
- AddMethod( name_, new Pointer_CppMethod20<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19), const char* docstring = 0, ValidMethod valid = &yes_arity<20> ){
+ AddMethod( name_, new Pointer_CppMethod20<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19>( fun ), valid, docstring ) ;
return *this ;
}
@@ -232,8 +232,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20), ValidMethod valid = &yes_arity<21> ){
- AddMethod( name_, new Pointer_CppMethod21<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20), const char* docstring = 0, ValidMethod valid = &yes_arity<21> ){
+ AddMethod( name_, new Pointer_CppMethod21<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20>( fun ), valid, docstring ) ;
return *this ;
}
@@ -242,8 +242,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21), ValidMethod valid = &yes_arity<22> ){
- AddMethod( name_, new Pointer_CppMethod22<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21), const char* docstring = 0, ValidMethod valid = &yes_arity<22> ){
+ AddMethod( name_, new Pointer_CppMethod22<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21>( fun ), valid, docstring ) ;
return *this ;
}
@@ -252,8 +252,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22), ValidMethod valid = &yes_arity<23> ){
- AddMethod( name_, new Pointer_CppMethod23<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22), const char* docstring = 0, ValidMethod valid = &yes_arity<23> ){
+ AddMethod( name_, new Pointer_CppMethod23<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22>( fun ), valid, docstring ) ;
return *this ;
}
@@ -262,8 +262,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23), ValidMethod valid = &yes_arity<24> ){
- AddMethod( name_, new Pointer_CppMethod24<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23), const char* docstring = 0, ValidMethod valid = &yes_arity<24> ){
+ AddMethod( name_, new Pointer_CppMethod24<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23>( fun ), valid, docstring ) ;
return *this ;
}
@@ -272,8 +272,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24), ValidMethod valid = &yes_arity<25> ){
- AddMethod( name_, new Pointer_CppMethod25<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24), const char* docstring = 0, ValidMethod valid = &yes_arity<25> ){
+ AddMethod( name_, new Pointer_CppMethod25<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24>( fun ), valid, docstring ) ;
return *this ;
}
@@ -282,8 +282,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24, typename U25>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25), ValidMethod valid = &yes_arity<26> ){
- AddMethod( name_, new Pointer_CppMethod26<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25), const char* docstring = 0, ValidMethod valid = &yes_arity<26> ){
+ AddMethod( name_, new Pointer_CppMethod26<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25>( fun ), valid, docstring ) ;
return *this ;
}
@@ -292,8 +292,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24, typename U25, typename U26>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26), ValidMethod valid = &yes_arity<27> ){
- AddMethod( name_, new Pointer_CppMethod27<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26), const char* docstring = 0, ValidMethod valid = &yes_arity<27> ){
+ AddMethod( name_, new Pointer_CppMethod27<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26>( fun ), valid, docstring ) ;
return *this ;
}
@@ -302,8 +302,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24, typename U25, typename U26, typename U27>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26, U27 u27), ValidMethod valid = &yes_arity<28> ){
- AddMethod( name_, new Pointer_CppMethod28<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26, U27>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26, U27 u27), const char* docstring = 0, ValidMethod valid = &yes_arity<28> ){
+ AddMethod( name_, new Pointer_CppMethod28<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26, U27>( fun ), valid, docstring ) ;
return *this ;
}
@@ -312,8 +312,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24, typename U25, typename U26, typename U27, typename U28>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26, U27 u27, U28 u28), ValidMethod valid = &yes_arity<29> ){
- AddMethod( name_, new Pointer_CppMethod29<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26, U27, U28>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26, U27 u27, U28 u28), const char* docstring = 0, ValidMethod valid = &yes_arity<29> ){
+ AddMethod( name_, new Pointer_CppMethod29<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26, U27, U28>( fun ), valid, docstring ) ;
return *this ;
}
@@ -322,8 +322,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24, typename U25, typename U26, typename U27, typename U28, typename U29>
- self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26, U27 u27, U28 u28, U29 u29), ValidMethod valid = &yes_arity<30> ){
- AddMethod( name_, new Pointer_CppMethod30<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26, U27, U28, U29>( fun ), valid ) ;
+ self& method( const char* name_, OUT (*fun)(Class*, U0 u0, U1 u1, U2 u2, U3 u3, U4 u4, U5 u5, U6 u6, U7 u7, U8 u8, U9 u9, U10 u10, U11 u11, U12 u12, U13 u13, U14 u14, U15 u15, U16 u16, U17 u17, U18 u18, U19 u19, U20 u20, U21 u21, U22 u22, U23 u23, U24 u24, U25 u25, U26 u26, U27 u27, U28 u28, U29 u29), const char* docstring = 0, ValidMethod valid = &yes_arity<30> ){
+ AddMethod( name_, new Pointer_CppMethod30<Class,OUT,U0, U1, U2, U3, U4, U5, U6, U7, U8, U9, U10, U11, U12, U13, U14, U15, U16, U17, U18, U19, U20, U21, U22, U23, U24, U25, U26, U27, U28, U29>( fun ), valid, docstring ) ;
return *this ;
}
@@ -332,8 +332,8 @@
template <typename OUT, typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9, typename U10, typename U11, typename U12, typename U13, typename U14, typename U15, typename U16, typename U17, typename U18, typename U19, typename U20, typename U21, typename U22, typename U23, typename U24, typename U25, typename U26, typename U27, typename U28, typename U29, typename U30>
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/rcpp -r 2485
More information about the Rcpp-commits
mailing list