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

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

Author: edd
Date: 2010-03-02 16:35:27 +0100 (Tue, 02 Mar 2010)
New Revision: 822

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadillo.h
Log:
for symmetry, use ARMA_VERSION_GE_070 instead of ARMA_HAS_CUBE


Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2010-03-02 15:34:38 UTC (rev 821)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2010-03-02 15:35:27 UTC (rev 822)
@@ -34,7 +34,7 @@
     template <typename T> SEXP wrap ( const arma::Row<T>& ) ;
     template <typename T> SEXP wrap ( const arma::Col<T>& ) ;
     template <typename T> SEXP wrap ( const arma::field<T>& ) ;
-    #if ARMA_HAS_CUBE
+    #if ARMA_VERSION_GE_070
     template <typename T> SEXP wrap ( const arma::Cube<T>& ) ;
     #endif
 
@@ -59,7 +59,7 @@
 	template <typename T> class Exporter< arma::Row<T> > ;
 	template <typename T> class Exporter< arma::Col<T> > ;
 // template <typename T> class Exporter< arma::field<T> > ;
-// #ifdef ARMA_HAS_CUBE
+// #ifdef ARMA_VERSION_GE_070
 // 	template <typename T> class Exporter< arma::Cube<T> > ;
 // #endif
 
@@ -101,7 +101,7 @@
 	return RcppArmadillo::arma_wrap(data, Dimension( 1, data.n_elem ) ) ;
     } ;
 
-    #if ARMA_HAS_CUBE
+    #if ARMA_VERSION_GE_070
     template <typename T> SEXP wrap( const arma::Cube<T>& data ){
 	return RcppArmadillo::arma_wrap(data, Dimension(  data.n_rows, data.n_cols, data.n_slices ) ) ;
     }