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

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

Author: edd
Date: 2012-02-05 00:06:26 +0100 (Sun, 05 Feb 2012)
New Revision: 3463

Modified:
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
Log:
I think you meant to Depends on Rcpp beyong 0.9.9.2, not 0.9.1.2

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2012-02-03 16:48:02 UTC (rev 3462)
+++ pkg/RcppArmadillo/DESCRIPTION	2012-02-04 23:06:26 UTC (rev 3463)
@@ -32,7 +32,7 @@
  the GNU GPL version 2 or later, as is the rest of Rcpp.
 License: GPL (>= 2)
 LazyLoad: yes
-Depends: R (>= 2.12.0), Rcpp (>= 0.9.1.2)
+Depends: R (>= 2.14.0), Rcpp (>= 0.9.9.2)
 LinkingTo: Rcpp
 Suggests: inline, RUnit
 URL: http://arma.sourceforge.net/, http://dirk.eddelbuettel.com/code/rcpp.armadillo.html, http://romainfrancois.blog.free.fr/index.php?category/R-package/RcppArmadillo

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-02-03 16:48:02 UTC (rev 3462)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-02-04 23:06:26 UTC (rev 3463)
@@ -59,5 +59,9 @@
 #undef ARMA_USE_CXX11
 #endif
 
+#if defined(ARMA_STD_COUT)
+#undef ARMA_STD_COUT
 #endif
 
+#endif
+