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

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

Author: edd
Date: 2012-04-11 22:31:04 +0200 (Wed, 11 Apr 2012)
New Revision: 3571

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
Log:
protect #define of ARMA_DEFAULT_OSTREAM by #ifndef test


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2012-04-10 19:31:00 UTC (rev 3570)
+++ pkg/RcppArmadillo/ChangeLog	2012-04-11 20:31:04 UTC (rev 3571)
@@ -1,3 +1,8 @@
+2012-04-11  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/RcppArmadilloConfig.h: Protect define of
+	ARMA_DEFAULT_OSTREAM by a #ifndef test
+
 2012-04-10  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.0

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-04-10 19:31:00 UTC (rev 3570)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-04-11 20:31:04 UTC (rev 3571)
@@ -61,7 +61,9 @@
 
 // Rcpp has its own stream object which cooperates more nicely with R's i/o
 // And as of Armadillo 2.4.3, we can use this stream object as well 
+#if !defined(ARMA_DEFAULT_OSTREAM)
 #define ARMA_DEFAULT_OSTREAM Rcpp::Rcout
+#endif
 
 #endif