[Rcpp-commits] r3544 - in pkg/RcppArmadillo: . inst/include

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

Author: romain
Date: 2012-03-24 11:10:22 +0100 (Sat, 24 Mar 2012)
New Revision: 3544

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h
Log:
adapt to Armadillo 2.99.1

Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2012-03-23 21:00:40 UTC (rev 3543)
+++ pkg/RcppArmadillo/ChangeLog	2012-03-24 10:10:22 UTC (rev 3544)
@@ -1,3 +1,7 @@
+2012-03-23  Romain Francois <romain at r-enthusiasts.com>
+
+	* inst/include/RcppArmadilloWrap.h: adpat to Armadillo 2.99.1
+
 2012-03-19  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/include/*: Upgraded to new test release 2.99.1 of Armadillo

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h	2012-03-23 21:00:40 UTC (rev 3543)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloWrap.h	2012-03-24 10:10:22 UTC (rev 3544)
@@ -2,7 +2,7 @@
 //
 // RcppArmadilloWrap.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010-2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010-2012 Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -211,7 +211,7 @@
 
     template <typename eT, typename gen_type>
     SEXP wrap( const arma::Gen<eT,gen_type>& X){
-        return wrap( arma::Mat<eT>( X ) ) ;
+        return wrap( eT(X) ) ;
     }