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

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

Author: romain
Date: 2012-12-10 17:11:09 +0100 (Mon, 10 Dec 2012)
New Revision: 4136

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/include/RcppArmadillo.h
Log:
compiler error when Rcpp.h is included before RcppArmadillo.h

Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2012-12-10 15:56:50 UTC (rev 4135)
+++ pkg/RcppArmadillo/ChangeLog	2012-12-10 16:11:09 UTC (rev 4136)
@@ -1,3 +1,8 @@
+2012-12-10  Romain Francois <romain at r-enthusiasts.com>
+
+    * include/RcppArmadillo.h: compiler error if Rcpp.h is included before
+    RcppArmadillo.h
+
 2012-12-07  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.6.0

Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2012-12-10 15:56:50 UTC (rev 4135)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2012-12-10 16:11:09 UTC (rev 4136)
@@ -22,6 +22,10 @@
 #ifndef RcppArmadillo__RcppArmadillo__h
 #define RcppArmadillo__RcppArmadillo__h
 
+#ifdef Rcpp_hpp
+    #error "'Rcpp.h' has been included before 'RcppArmadillo.h'. This is wrong. "
+#endif
+
 #include <RcppArmadilloForward.h>
 #include <Rcpp.h>
 #include <RcppArmadilloWrap.h>