[Rcpp-commits] r1905 - pkg/RcppArmadillo/inst/include

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

Author: romain
Date: 2010-08-03 21:05:28 +0200 (Tue, 03 Aug 2010)
New Revision: 1905

Modified:
   pkg/RcppArmadillo/inst/include/README
   pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
   pkg/RcppArmadillo/inst/include/armadillo
Log:
simplify further

Modified: pkg/RcppArmadillo/inst/include/README
===================================================================
--- pkg/RcppArmadillo/inst/include/README	2010-08-03 18:59:45 UTC (rev 1904)
+++ pkg/RcppArmadillo/inst/include/README	2010-08-03 19:05:28 UTC (rev 1905)
@@ -2,14 +2,4 @@
 
 - copy the armadillo file here
 - replace the armadillo_bits directory by the one from the armadillo source
-- edit the armadillo file so that #include "armadillo_bits/config.hpp" is surrounded by RcppArmadillo includes: 
 
-
-// RcppArmadillo: add the R defines
-#include <Rconfig.h>
-
-#include "armadillo_bits/config.hpp"
-
-// RcppArmadillo: add the RcppArmadillo configuration
-#include <RcppArmadilloConfig.h>
-

Modified: pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2010-08-03 18:59:45 UTC (rev 1904)
+++ pkg/RcppArmadillo/inst/include/RcppArmadilloForward.h	2010-08-03 19:05:28 UTC (rev 1905)
@@ -23,6 +23,8 @@
 #define RcppArmadillo__RcppArmadilloForward__h
 
 #include <RcppCommon.h>
+#include <Rconfig.h>
+#include <RcppArmadilloConfig.h>
 
 #include <armadillo>
 

Modified: pkg/RcppArmadillo/inst/include/armadillo
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo	2010-08-03 18:59:45 UTC (rev 1904)
+++ pkg/RcppArmadillo/inst/include/armadillo	2010-08-03 19:05:28 UTC (rev 1905)
@@ -32,15 +32,7 @@
 #include <complex>
 #include <vector>
 
-
-// RcppArmadillo: add the R defines
-#include <Rconfig.h>
-
 #include "armadillo_bits/config.hpp"
-
-// RcppArmadillo: add the RcppArmadillo configuration
-#include <RcppArmadilloConfig.h>
-
 #include "armadillo_bits/compiler_setup.hpp"