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

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

Author: edd
Date: 2010-12-03 22:18:15 +0100 (Fri, 03 Dec 2010)
New Revision: 2697

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/module/Module_generated_ctor_signature.h
Log:
second patch by Tama Ma for 7th arg in module ctor -- R CMD check still blows up


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2010-12-03 21:06:10 UTC (rev 2696)
+++ pkg/Rcpp/ChangeLog	2010-12-03 21:18:15 UTC (rev 2697)
@@ -3,6 +3,7 @@
 	* inst/include/Rcpp/module/Module_generated_Constructor.h: Applied
 	patch by Tama Ma <pingnang at phys.ethz.ch> for up to seven args in ctor
 	* inst/include/Rcpp/module/Module_generated_class_constructor.h: Idem
+	* inst/include/Rcpp/module/Module_generated_ctor_signature.h: Idem
 
 2010-12-03  Romain Francois <romain at r-enthusiasts.com>
 

Modified: pkg/Rcpp/inst/include/Rcpp/module/Module_generated_ctor_signature.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/module/Module_generated_ctor_signature.h	2010-12-03 21:06:10 UTC (rev 2696)
+++ pkg/Rcpp/inst/include/Rcpp/module/Module_generated_ctor_signature.h	2010-12-03 21:18:15 UTC (rev 2697)
@@ -97,4 +97,20 @@
     return s.c_str() ;
 }
 
+template <typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6>
+inline const char* ctor_signature( const std::string& classname ){
+    std::string s( classname ) ;
+    s += "(" ; 
+    s += get_return_type<U0>() ;
+    s += ", " ; s+= get_return_type<U1>() ;
+    s += ", " ; s+= get_return_type<U2>() ;
+    s += ", " ; s+= get_return_type<U3>() ;
+    s += ", " ; s+= get_return_type<U4>() ;
+    s += ", " ; s+= get_return_type<U5>() ;
+    s += ", " ; s+= get_return_type<U6>() ;
+    s += ")" ;
+    return s.c_str() ;
+}
+
+
 #endif