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

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

Author: romain
Date: 2010-08-03 20:56:53 +0200 (Tue, 03 Aug 2010)
New Revision: 1903

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
   pkg/RcppArmadillo/inst/include/armadillo
   pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp
Log:
minor changes to ease next armadillo upgrades

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2010-08-03 18:41:46 UTC (rev 1902)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2010-08-03 18:56:53 UTC (rev 1903)
@@ -22,6 +22,20 @@
 #ifndef RcppArmadillo__RcppArmadilloConfig__h
 #define RcppArmadillo__RcppArmadilloConfig__h
 
+#if !defined(ARMA_USE_LAPACK)
+#define ARMA_USE_LAPACK
+#endif
+
+#if !defined(ARMA_USE_BLAS)
+#define ARMA_USE_BLAS
+#endif
+
+#define ARMA_HAVE_STD_ISFINITE
+#define ARMA_HAVE_STD_ISINF
+#define ARMA_HAVE_STD_ISNAN
+#define ARMA_HAVE_STD_SNPRINTF
+
+
 /* TODO: we might need to undef this on other platforms as well */
 #if defined(__GNUC__) && defined(_WIN64)
 #undef ARMA_HAVE_STD_SNPRINTF

Modified: pkg/RcppArmadillo/inst/include/armadillo
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo	2010-08-03 18:41:46 UTC (rev 1902)
+++ pkg/RcppArmadillo/inst/include/armadillo	2010-08-03 18:56:53 UTC (rev 1903)
@@ -33,7 +33,14 @@
 #include <vector>
 
 
+// RcppArmadillo: add the R defines
+#include <Rconfig.h>
+
 #include "armadillo_bits/config.hpp"
+
+// RcppArmadillo: add the RcppArmadillo configuration
+#include <RcppArmadilloConfig.h>
+
 #include "armadillo_bits/compiler_setup.hpp"
 
 

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp	2010-08-03 18:41:46 UTC (rev 1902)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp	2010-08-03 18:56:53 UTC (rev 1903)
@@ -13,15 +13,12 @@
 // of the License or (at your option) any later version.
 // (see http://www.opensource.org/licenses for more info)
 
-// RcppArmadillo: add the R defines
-#include <Rconfig.h>
-
 #if !defined(ARMA_USE_LAPACK)
-#define ARMA_USE_LAPACK
+// #define ARMA_USE_LAPACK
 #endif
 
 #if !defined(ARMA_USE_BLAS)
-#define ARMA_USE_BLAS
+// #define ARMA_USE_BLAS
 #endif
 
 // #define ARMA_USE_ATLAS
@@ -33,10 +30,10 @@
 // #define ARMA_USE_BOOST
 // #define ARMA_USE_BOOST_DATE
 
-#define ARMA_HAVE_STD_ISFINITE
-#define ARMA_HAVE_STD_ISINF
-#define ARMA_HAVE_STD_ISNAN
-#define ARMA_HAVE_STD_SNPRINTF
+// #define ARMA_HAVE_STD_ISFINITE
+// #define ARMA_HAVE_STD_ISINF
+// #define ARMA_HAVE_STD_ISNAN
+// #define ARMA_HAVE_STD_SNPRINTF
 
 // #define ARMA_HAVE_LOG1P
 // #define ARMA_HAVE_GETTIMEOFDAY
@@ -44,5 +41,3 @@
 // #define ARMA_EXTRA_DEBUG
 // #define ARMA_NO_DEBUG
 
-// RcppArmadillo: add the RcppArmadillo configuration
-#include <RcppArmadilloConfig.h>