[Rcpp-commits] r3369 - pkg/RcppArmadillo/inst/include

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

Author: romain
Date: 2011-11-16 12:24:06 +0100 (Wed, 16 Nov 2011)
New Revision: 3369

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
   pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h
Log:
wrap support for Op<>

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2011-11-16 11:12:20 UTC (rev 3368)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2011-11-16 11:24:06 UTC (rev 3369)
@@ -74,6 +74,10 @@
     template<typename out_eT, typename T1, typename T2, typename glue_type>
     SEXP wrap( const arma::mtGlue<out_eT,T1,T2,glue_type>& X );
     
+    template <typename eT, typename gen_type>
+    SEXP wrap( const arma::Gen<eT,gen_type>& X) ;
+    
+    
     namespace traits {
 
 	/* support for as */

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h	2011-11-16 11:12:20 UTC (rev 3368)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h	2011-11-16 11:24:06 UTC (rev 3369)
@@ -204,6 +204,12 @@
     	return wrap( arma::Mat<out_eT>( X ) ) ;
     }
 
+    template <typename eT, typename gen_type>
+    SEXP wrap( const arma::Gen<eT,gen_type>& X){
+        return wrap( arma::Mat<eT>( X ) ) ;
+    }
+    
+    
     /* support for Rcpp::as */
 
     namespace traits {