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

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

Author: edd
Date: 2012-12-11 15:30:13 +0100 (Tue, 11 Dec 2012)
New Revision: 4147

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/inst/include/RcppArmadillo.h
Log:
minor rewording of error message


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2012-12-11 14:04:58 UTC (rev 4146)
+++ pkg/RcppArmadillo/ChangeLog	2012-12-11 14:30:13 UTC (rev 4147)
@@ -1,7 +1,7 @@
 2012-12-10  Romain Francois <romain at r-enthusiasts.com>
 
-    * include/RcppArmadillo.h: compiler error if Rcpp.h is included before
-    RcppArmadillo.h
+	* include/RcppArmadillo.h: compiler error if Rcpp.h is included
+	before RcppArmadillo.h
 
 2012-12-07  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/RcppArmadillo/inst/include/RcppArmadillo.h
===================================================================
--- pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2012-12-11 14:04:58 UTC (rev 4146)
+++ pkg/RcppArmadillo/inst/include/RcppArmadillo.h	2012-12-11 14:30:13 UTC (rev 4147)
@@ -2,7 +2,7 @@
 //
 // RcppArmadillo.h: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)  2010 - 2012  Dirk Eddelbuettel, Romain Francois and Douglas Bates
 //
 // This file is part of RcppArmadillo.
 //
@@ -23,7 +23,7 @@
 #define RcppArmadillo__RcppArmadillo__h
 
 #ifdef Rcpp_hpp
-    #error "'Rcpp.h' has been included before 'RcppArmadillo.h'. This is wrong. "
+    #error "The file 'Rcpp.h' should not be included. Please correct to include only 'RcppArmadillo.h'."
 #endif
 
 #include <RcppArmadilloForward.h>