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

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

Author: edd
Date: 2012-02-05 00:25:20 +0100 (Sun, 05 Feb 2012)
New Revision: 3464

Modified:
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
   pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp
Log:
minor cleanup, moving ARMA_DEFAULT_STREAM definition from Arma's config.hpp to our Config header


Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-02-04 23:06:26 UTC (rev 3463)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-02-04 23:25:20 UTC (rev 3464)
@@ -59,9 +59,8 @@
 #undef ARMA_USE_CXX11
 #endif
 
-#if defined(ARMA_STD_COUT)
-#undef ARMA_STD_COUT
-#endif
+// Rcpp has its own stream object which cooperates more nicely with R's i/o
+#define ARMA_DEFAULT_STREAM Rcpp::Rcout
 
 #endif
 

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp	2012-02-04 23:06:26 UTC (rev 3463)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/config.hpp	2012-02-04 23:25:20 UTC (rev 3464)
@@ -10,8 +10,6 @@
 // of the License or (at your option) any later version.
 // (see http://www.opensource.org/licenses for more info)
 
-#define ARMA_DEFAULT_STREAM Rcpp::Rcout
-
 // #define ARMA_64BIT_WORD
 //// Uncomment the above line if you require matrices/vectors capable of holding more than 4 billion elements.
 //// Your machine and compiler must have support for 64 bit integers (eg. via "long" or "long long")