[Rcpp-commits] r1959 - in pkg/Rcpp/inst: . include include/Rcpp/stats

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

Author: romain
Date: 2010-08-10 08:03:51 +0200 (Tue, 10 Aug 2010)
New Revision: 1959

Modified:
   pkg/Rcpp/inst/ChangeLog
   pkg/Rcpp/inst/include/Rcpp/stats/stats.h
   pkg/Rcpp/inst/include/RcppCommon.h
Log:
fixed Rf_ftruc name clash

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-08-10 05:53:10 UTC (rev 1958)
+++ pkg/Rcpp/inst/ChangeLog	2010-08-10 06:03:51 UTC (rev 1959)
@@ -1,6 +1,9 @@
 2010-08-10  Romain Francois <romain at r-enthusiasts.com>
 
 	* inst/include/Rcpp/stats/random/rnorm.h: Added rnorm and rnorm_
+	
+	* inst/include/Rcpp/stats/stats.h : fixed name clash reported on Rcpp-devel
+	http://permalink.gmane.org/gmane.comp.lang.r.rcpp/610
 
 2010-08-09  Romain Francois <romain at r-enthusiasts.com>
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/stats.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/stats.h	2010-08-10 05:53:10 UTC (rev 1958)
+++ pkg/Rcpp/inst/include/Rcpp/stats/stats.h	2010-08-10 06:03:51 UTC (rev 1959)
@@ -22,6 +22,8 @@
 #ifndef Rcpp__stats__stats_h
 #define Rcpp__stats__stats_h
 
+#include <Rmath.h>
+
 #include <Rcpp/stats/unif.h>
 #include <Rcpp/stats/norm.h>
 #include <Rcpp/stats/gamma.h>

Modified: pkg/Rcpp/inst/include/RcppCommon.h
===================================================================
--- pkg/Rcpp/inst/include/RcppCommon.h	2010-08-10 05:53:10 UTC (rev 1958)
+++ pkg/Rcpp/inst/include/RcppCommon.h	2010-08-10 06:03:51 UTC (rev 1959)
@@ -107,7 +107,6 @@
 #include <R_ext/Parse.h>
 #include <R_ext/Rdynload.h>
 #include <Rversion.h>
-#include <Rmath.h>
 #define RCPP_GET_NAMES(x)	Rf_getAttrib(x, R_NamesSymbol)
 
 #if defined(R_VERSION) && R_VERSION >= R_Version(2, 12, 0)