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

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

Author: romain
Date: 2010-08-19 07:43:25 +0200 (Thu, 19 Aug 2010)
New Revision: 2041

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
   pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp
Log:
more consistent macro name

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2010-08-18 20:14:23 UTC (rev 2040)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2010-08-19 05:43:25 UTC (rev 2041)
@@ -26,8 +26,8 @@
 #include <Rconfig.h>
 #include <RcppArmadilloConfig.h>
 
-#define ARMADILLO_EXTRA_MAT_PROTO "RcppArmadillo/Mat_proto.h"
-#define ARMADILLO_EXTRA_MAT_MEAT  "RcppArmadillo/Mat_meat.h"
+#define ARMA_EXTRA_MAT_PROTO "RcppArmadillo/Mat_proto.h"
+#define ARMA_EXTRA_MAT_MEAT  "RcppArmadillo/Mat_meat.h"
 
 #include <armadillo>
 

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp	2010-08-18 20:14:23 UTC (rev 2040)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp	2010-08-19 05:43:25 UTC (rev 2041)
@@ -3416,8 +3416,8 @@
   }
 
 
-#ifdef ARMADILLO_EXTRA_MAT_MEAT
-#include ARMADILLO_EXTRA_MAT_MEAT
+#ifdef ARMA_EXTRA_MAT_MEAT
+#include ARMA_EXTRA_MAT_MEAT
 #endif
 
 

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp	2010-08-18 20:14:23 UTC (rev 2040)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp	2010-08-19 05:43:25 UTC (rev 2041)
@@ -174,8 +174,8 @@
   template<typename T1, typename T2, typename glue_type> inline const Mat& operator%=(const mtGlue<eT, T1, T2, glue_type>& X);
   template<typename T1, typename T2, typename glue_type> inline const Mat& operator/=(const mtGlue<eT, T1, T2, glue_type>& X);
   
-#ifdef ARMADILLO_EXTRA_MAT_PROTO
-#include ARMADILLO_EXTRA_MAT_PROTO
+#ifdef ARMA_EXTRA_MAT_PROTO
+#include ARMA_EXTRA_MAT_PROTO
 #endif
   
   arma_inline eT& operator[] (const u32 i);