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

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

Author: edd
Date: 2012-01-01 01:51:03 +0100 (Sun, 01 Jan 2012)
New Revision: 3438

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h
   pkg/RcppArmadillo/src/RcppArmadillo.cpp
Log:
commit two suggested emailed in the last two days:
 - var instantiation for arma versions
 - missing semicolon in C++0x mode branch


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2011-12-31 20:32:24 UTC (rev 3437)
+++ pkg/RcppArmadillo/ChangeLog	2012-01-01 00:51:03 UTC (rev 3438)
@@ -1,3 +1,13 @@
+2011-12-31  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/include/RcppArmadillo/Mat_meat.h: Add missing semicolon in
+	code ifdef'ed for C++0x mode, with thanks to Teo Guo Ci
+
+2011-12-29  Dirk Eddelbuettel  <edd at debian.org>
+
+	* src/RcppArmadillo.cpp: Force instantiation of arma version vars
+	which helps with older OS X compiler, as suggested by Gershon Bialer
+
 2011-12-23  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/unitTests/runTests.R: unit tests output 'fallback' directory

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2011-12-31 20:32:24 UTC (rev 3437)
+++ pkg/RcppArmadillo/DESCRIPTION	2012-01-01 00:51:03 UTC (rev 3438)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.2.34
+Version: 0.2.34.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/include/RcppArmadillo/Mat_meat.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h	2011-12-31 20:32:24 UTC (rev 3437)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo/Mat_meat.h	2012-01-01 00:51:03 UTC (rev 3438)
@@ -29,7 +29,7 @@
 #if !defined(ARMA_USE_CXX11)
 	arma_type_check_cxx1998< is_same_type< eT, rcpp_type >::value == false >::apply();
 #else
-    static_assert( is_same_type< eT, rcpp_type >::value , "error: incorrect or unsupported type" )
+	static_assert( is_same_type< eT, rcpp_type >::value , "error: incorrect or unsupported type" );
 #endif
     }
     

Modified: pkg/RcppArmadillo/src/RcppArmadillo.cpp
===================================================================
--- pkg/RcppArmadillo/src/RcppArmadillo.cpp	2011-12-31 20:32:24 UTC (rev 3437)
+++ pkg/RcppArmadillo/src/RcppArmadillo.cpp	2012-01-01 00:51:03 UTC (rev 3438)
@@ -23,8 +23,12 @@
 
 using namespace Rcpp;
 
-extern "C" SEXP armadillo_version(SEXP single_){
+const unsigned int arma::arma_version::major;
+const unsigned int arma::arma_version::minor;
+const unsigned int arma::arma_version::patch;
 
+extern "C" SEXP armadillo_version(SEXP single_) {
+
     bool single = as<bool>( single_) ;
 
     if( single ){