[Rcpp-commits] r2044 - pkg/RcppArmadillo/inst/include/armadillo_bits

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

Author: romain
Date: 2010-08-19 08:59:21 +0200 (Thu, 19 Aug 2010)
New Revision: 2044

Modified:
   pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_meat.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/field_meat.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/field_proto.hpp
Log:
also add hooks for Cube and field (although not using them ATM)

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_meat.hpp	2010-08-19 06:38:05 UTC (rev 2043)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_meat.hpp	2010-08-19 06:59:21 UTC (rev 2044)
@@ -2233,5 +2233,8 @@
   }
 
 
+#ifdef ARMA_EXTRA_CUBE_MEAT
+#include ARMA_EXTRA_CUBE_MEAT
+#endif
 
 //! @}

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp	2010-08-19 06:38:05 UTC (rev 2043)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp	2010-08-19 06:59:21 UTC (rev 2044)
@@ -113,6 +113,10 @@
   template<typename T1, typename T2, typename eglue_type> inline const Cube& operator%=(const eGlueCube<T1, T2, eglue_type>& X);
   template<typename T1, typename T2, typename eglue_type> inline const Cube& operator/=(const eGlueCube<T1, T2, eglue_type>& X);
   
+#ifdef ARMA_EXTRA_CUBE_PROTO
+#include ARMA_EXTRA_CUBE_PROTO
+#endif
+
   arma_inline eT& operator[] (const u32 i);
   arma_inline eT  operator[] (const u32 i) const;
   arma_inline eT& operator() (const u32 i);

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/field_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/field_meat.hpp	2010-08-19 06:38:05 UTC (rev 2043)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/field_meat.hpp	2010-08-19 06:59:21 UTC (rev 2044)
@@ -1726,6 +1726,9 @@
   return diskio::load_std_string(x, is, err_msg);
   }
 
+#ifdef ARMA_EXTRA_FIELD_MEAT
+#include ARMA_EXTRA_FIELD_MEAT
+#endif
 
 
 //! @}

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/field_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/field_proto.hpp	2010-08-19 06:38:05 UTC (rev 2043)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/field_proto.hpp	2010-08-19 06:59:21 UTC (rev 2044)
@@ -63,6 +63,10 @@
   inline explicit field(const u32 n_elem_in);
   inline          field(const u32 n_rows_in, const u32 n_cols_in);
   
+#ifdef ARMA_EXTRA_FIELD_PROTO
+#include ARMA_EXTRA_FIELD_PROTO
+#endif
+
   inline void  set_size(const u32 n_obj_in);
   inline void  set_size(const u32 n_rows_in, const u32 n_cols_in);