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

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

Author: romain
Date: 2013-08-02 08:33:38 +0200 (Fri, 02 Aug 2013)
New Revision: 4416

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/include/RcppArmadillo/Col_meat.h
   pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h
   pkg/RcppArmadillo/inst/include/RcppArmadillo/Row_meat.h
Log:
handle vec_state

Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2013-08-02 04:53:29 UTC (rev 4415)
+++ pkg/RcppArmadillo/ChangeLog	2013-08-02 06:33:38 UTC (rev 4416)
@@ -1,3 +1,9 @@
+2013-08-02 Romain Francois <romain at r-enthusiasts.com>
+
+        * include/RcppArmadillo/Row_meat.h : set vec_state correctly
+        * include/RcppArmadillo/Col_meat.h : set vec_state correctly
+        * include/RcppArmadillo/Mat_meat.h : set vec_state correctly
+        
 2013-07-31  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.900.7

Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo/Col_meat.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo/Col_meat.h	2013-08-02 04:53:29 UTC (rev 4415)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo/Col_meat.h	2013-08-02 06:33:38 UTC (rev 4416)
@@ -2,7 +2,7 @@
 //
 // Col_meat.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2011 - 2013 Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -28,6 +28,7 @@
     : Mat<eT>( X ) 
 {	
     arma_extra_debug_sigprint(this);
+    access::rw(Mat<eT>::vec_state) = 1;
 }
 
 template <typename eT>

Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h	2013-08-02 04:53:29 UTC (rev 4415)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h	2013-08-02 06:33:38 UTC (rev 4416)
@@ -2,7 +2,7 @@
 //
 // Mat_meat.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010 - 2012  Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2013  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //

Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo/Row_meat.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo/Row_meat.h	2013-08-02 04:53:29 UTC (rev 4415)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo/Row_meat.h	2013-08-02 06:33:38 UTC (rev 4416)
@@ -2,7 +2,7 @@
 //
 // Row_meat.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2011 - 2013 Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -28,6 +28,7 @@
 	: Mat<eT>( X ) {	
 	arma_extra_debug_sigprint(this);
 	std::swap( access::rw(Mat<eT>::n_rows), access::rw(Mat<eT>::n_cols) );
+	access::rw(Mat<eT>::vec_state) = 2;
 }
 
 template <typename eT>