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

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

Author: edd
Date: 2012-04-17 14:36:07 +0200 (Tue, 17 Apr 2012)
New Revision: 3575

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/inst/NEWS
   pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
Log:
undefine NDEBUG if it has been set as suggested by Conrad


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2012-04-12 13:18:19 UTC (rev 3574)
+++ pkg/RcppArmadillo/ChangeLog	2012-04-17 12:36:07 UTC (rev 3575)
@@ -1,3 +1,8 @@
+2012-04-17  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/RcppArmadilloConfig.h: Undefine NDEBUG to not suppress
+	Armadillo dedebug messages
+
 2012-04-12  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.0.1

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2012-04-12 13:18:19 UTC (rev 3574)
+++ pkg/RcppArmadillo/DESCRIPTION	2012-04-17 12:36:07 UTC (rev 3575)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.3.0.1
+Version: 0.3.0.1.1
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
 Maintainer: Romain Francois, Dirk Eddelbuettel and Doug Bates <RcppArmadillo-authors at r-enthusiasts.com>

Modified: pkg/RcppArmadillo/inst/NEWS
===================================================================
--- pkg/RcppArmadillo/inst/NEWS	2012-04-12 13:18:19 UTC (rev 3574)
+++ pkg/RcppArmadillo/inst/NEWS	2012-04-17 12:36:07 UTC (rev 3575)
@@ -1,3 +1,9 @@
+0.3.0.2 2012-xx-yy
+
+    o   Undefine NDEBUG if it has been set (as R does) as this prevents a
+        number of useful debugging checks. Users can still define it or
+        define ARMA_NO_DEBUG if they want a 'non-development' build
+
 0.3.0.1 2012-04-12
 
     o   Upgraded to Armadillo release 3.0.1

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-04-12 13:18:19 UTC (rev 3574)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloConfig.h	2012-04-17 12:36:07 UTC (rev 3575)
@@ -65,5 +65,11 @@
 #define ARMA_DEFAULT_OSTREAM Rcpp::Rcout
 #endif
 
+// R now defines NDEBUG which suppresses a number of useful Armadillo tests
+// Users can still defined it later, and/or define ARMA_NO_DEBUG
+#if defined(NDEBUG)
+#undef NDEBUG
 #endif
 
+#endif
+