[Rinside-commits] r274 - in pkg: . inst/examples/armadillo

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

Author: edd
Date: 2013-04-23 00:57:35 +0200 (Tue, 23 Apr 2013)
New Revision: 274

Modified:
   pkg/ChangeLog
   pkg/inst/examples/armadillo/rinside_arma0.cpp
   pkg/inst/examples/armadillo/rinside_arma1.cpp
Log:
reorder include files for Armadillo example


Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2013-02-13 01:55:49 UTC (rev 273)
+++ pkg/ChangeLog	2013-04-22 22:57:35 UTC (rev 274)
@@ -1,3 +1,9 @@
+2013-04-22  Dirk Eddelbuettel  <edd at debian.org>
+
+	* inst/examples/armadillo/rinside_arma0.cpp: Reverse order of
+	includes so that RcppArmadillo.h is included before RInside
+	* inst/examples/armadillo/rinside_arma1.cpp: Idem
+
 2013-02-12  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/include/RInside.h: Set default value of loadRcpp to true

Modified: pkg/inst/examples/armadillo/rinside_arma0.cpp
===================================================================
--- pkg/inst/examples/armadillo/rinside_arma0.cpp	2013-02-13 01:55:49 UTC (rev 273)
+++ pkg/inst/examples/armadillo/rinside_arma0.cpp	2013-04-22 22:57:35 UTC (rev 274)
@@ -2,10 +2,10 @@
 //
 // Simple example using Armadillo classes
 //
-// Copyright (C) 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2013  Dirk Eddelbuettel and Romain Francois
 
+#include <RcppArmadillo.h>      	// for Armadillo as well as Rcpp 
 #include <RInside.h>                    // for the embedded R via RInside
-#include <RcppArmadillo.h>
 
 int main(int argc, char *argv[]) {
 

Modified: pkg/inst/examples/armadillo/rinside_arma1.cpp
===================================================================
--- pkg/inst/examples/armadillo/rinside_arma1.cpp	2013-02-13 01:55:49 UTC (rev 273)
+++ pkg/inst/examples/armadillo/rinside_arma1.cpp	2013-04-22 22:57:35 UTC (rev 274)
@@ -2,10 +2,10 @@
 //
 // Simple example using Armadillo on matrix data generated in R
 //
-// Copyright (C) 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2013  Dirk Eddelbuettel and Romain Francois
 
+#include <RcppArmadillo.h>      	// for Armadillo as well as Rcpp 
 #include <RInside.h>                    // for the embedded R via RInside
-#include <RcppArmadillo.h>
 
 int main(int argc, char *argv[]) {