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

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

Author: edd
Date: 2011-06-30 09:29:10 +0200 (Thu, 30 Jun 2011)
New Revision: 3113

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/inst/NEWS
   pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/diagmat_proxy.hpp
Log:
Release 0.2.25 with Armadillo 2.0.1


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2011-06-29 15:29:15 UTC (rev 3112)
+++ pkg/RcppArmadillo/ChangeLog	2011-06-30 07:29:10 UTC (rev 3113)
@@ -1,3 +1,9 @@
+2011-06-30  Dirk Eddelbuettel  <edd at debian.org>
+
+	* DESCRIPTION: Release 0.2.25
+
+	* inst/include/*: Updated to release 2.0.1 of Armadillo
+
 2011-06-29  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.2.24

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2011-06-29 15:29:15 UTC (rev 3112)
+++ pkg/RcppArmadillo/DESCRIPTION	2011-06-30 07:29:10 UTC (rev 3113)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.2.24
+Version: 0.2.25
 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	2011-06-29 15:29:15 UTC (rev 3112)
+++ pkg/RcppArmadillo/inst/NEWS	2011-06-30 07:29:10 UTC (rev 3113)
@@ -1,3 +1,7 @@
+0.2.25  2011-06-30
+
+    o   Upgraded to Armadillo 2.0.1 which fixes two minor compilation issues
+
 0.2.24  2011-06-29
 
     o   Upgraded to Armadillo release 2.0.0 "Carnivorous Sugar Glider"

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp	2011-06-29 15:29:15 UTC (rev 3112)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp	2011-06-30 07:29:10 UTC (rev 3113)
@@ -18,7 +18,7 @@
 
 #define ARMA_VERSION_MAJOR 2
 #define ARMA_VERSION_MINOR 0
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 1
 #define ARMA_VERSION_NAME  "Carnivorous Sugar Glider"
 // http://en.wikipedia.org/wiki/Sugar_glider
 

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp	2011-06-29 15:29:15 UTC (rev 3112)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp	2011-06-30 07:29:10 UTC (rev 3113)
@@ -839,7 +839,7 @@
       {
       out_val  = eT(0);
       out_sign =  T(1);
-      return;
+      return true;
       }
     
     podarray<int> ipiv(tmp.n_rows);
@@ -881,7 +881,7 @@
       {
       out_val  = eT(0);
       out_sign =  T(1);
-      return;
+      return true;
       }
     
     podarray<blas_int> ipiv(tmp.n_rows);

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/diagmat_proxy.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/diagmat_proxy.hpp	2011-06-29 15:29:15 UTC (rev 3112)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/diagmat_proxy.hpp	2011-06-30 07:29:10 UTC (rev 3113)
@@ -43,7 +43,7 @@
   elem_type
   operator[](const u32 i) const
     {
-    if( (Proxy<T1>::prefer_at_operator == true) || (P_is_vec == false) )
+    if( (Proxy<T1>::prefer_at_accessor == true) || (P_is_vec == false) )
       {
       return P.at(i,i);
       }
@@ -60,7 +60,7 @@
     {
     if(row == col)
       {
-      if( (Proxy<T1>::prefer_at_operator == true) || (P_is_vec == false) )
+      if( (Proxy<T1>::prefer_at_accessor == true) || (P_is_vec == false) )
         {
         return P.at(row,row);
         }