[Rcpp-commits] r3843 - in pkg/Rcpp: . inst/doc inst/include inst/include/Rcpp/stats inst/include/Rcpp/stats/random inst/include/Rcpp/sugar/functions inst/unitTests src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Oct 26 21:42:05 CEST 2012


Author: edd
Date: 2012-10-26 21:42:05 +0200 (Fri, 26 Oct 2012)
New Revision: 3843

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/DESCRIPTION
   pkg/Rcpp/inst/doc/Rcpp.bib
   pkg/Rcpp/inst/include/Rcpp/stats/beta.h
   pkg/Rcpp/inst/include/Rcpp/stats/binom.h
   pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h
   pkg/Rcpp/inst/include/Rcpp/stats/chisq.h
   pkg/Rcpp/inst/include/Rcpp/stats/exp.h
   pkg/Rcpp/inst/include/Rcpp/stats/f.h
   pkg/Rcpp/inst/include/Rcpp/stats/gamma.h
   pkg/Rcpp/inst/include/Rcpp/stats/geom.h
   pkg/Rcpp/inst/include/Rcpp/stats/hyper.h
   pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h
   pkg/Rcpp/inst/include/Rcpp/stats/logis.h
   pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h
   pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h
   pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h
   pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h
   pkg/Rcpp/inst/include/Rcpp/stats/nf.h
   pkg/Rcpp/inst/include/Rcpp/stats/norm.h
   pkg/Rcpp/inst/include/Rcpp/stats/nt.h
   pkg/Rcpp/inst/include/Rcpp/stats/pois.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rbeta.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rbinom.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rchisq.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rf.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rgamma.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rgeom.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rhyper.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom_mu.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rnchisq.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rpois.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rsignrank.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rt.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rweibull.h
   pkg/Rcpp/inst/include/Rcpp/stats/random/rwilcox.h
   pkg/Rcpp/inst/include/Rcpp/stats/t.h
   pkg/Rcpp/inst/include/Rcpp/stats/unif.h
   pkg/Rcpp/inst/include/Rcpp/stats/weibull.h
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/complex.h
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/math.h
   pkg/Rcpp/inst/include/RcppCommon.h
   pkg/Rcpp/inst/unitTests/runit.support.R
   pkg/Rcpp/src/Datetime.cpp
Log:
reverting to before the unsuccessful test with the 'R' namespace


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/ChangeLog	2012-10-26 19:42:05 UTC (rev 3843)
@@ -1,14 +1,3 @@
-2012-10-26  Dirk Eddelbuettel  <edd at debian.org>
-
-	* inst/include/RcppCommon.h: Include Rmath.h in a namespace for R so
-	that these R API functions become available as R::foo
-	* inst/include/stats/*: Adapt various header files to this change
-	* inst/include/stats/random/*: Idem
-	* inst/include/sugar/functions/complex.h: Idem
-	* inst/include/sugar/functions/math.h: Idem
-	* src/Datetime.cpp: Idem
-	* inst/unitTests/runit.support.R: Idem
-
 2012-10-25  Romain Francois <romain at r-enthusiasts.com>
 
         * include/Rcpp/internal/wrap.h: wrapping module object with the help
@@ -40,17 +29,17 @@
         simplified the code (removing 35% of the generated code now rendered useless)
         * include/Rcpp/module/Module_generated_PointerCppMethod.h: using module_wrap and
         simplified the code
-        * include/Rcpp/traits/module_wrap_traits.h : new file. helping implementation of
+        * include/Rcpp/traits/module_wrap_traits.h : new file. helping implementation of 
         module_wrap
-
+        
         * R/00_classes.R: C++OverloadedMethods gets the field "nargs" to capture
         the number of arguments
-
+        
         * R/01_show.R: cleanup
-
-        * R/Module.R: handle the case where a method has no argument. In that
+        
+        * R/Module.R: handle the case where a method has no argument. In that 
         case, the ellipsis does not end up in the formals
-
+        
         * include/Rcpp/Module.h: exposing nargs in C++OverloadedMethods
 
 2012-10-22  Romain Francois <romain at r-enthusiasts.com>

Modified: pkg/Rcpp/DESCRIPTION
===================================================================
--- pkg/Rcpp/DESCRIPTION	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/DESCRIPTION	2012-10-26 19:42:05 UTC (rev 3843)
@@ -1,6 +1,6 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.9.15.5
+Version: 0.9.15.4
 Date: $Date$
 Author: Dirk Eddelbuettel and Romain Francois, with contributions 
  by Douglas Bates and John Chambers

Modified: pkg/Rcpp/inst/doc/Rcpp.bib
===================================================================
--- pkg/Rcpp/inst/doc/Rcpp.bib	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/doc/Rcpp.bib	2012-10-26 19:42:05 UTC (rev 3843)
@@ -243,9 +243,9 @@
 @Manual{GSL,
   title = 	{{GNU} {S}cientific {L}ibrary {R}eference {M}anual},
   author = 	{Mark Galassi and Jim Davies and James Theiler and Brian Gough and Gerard Jungman and Patrick Alken and Michael Booth and Fabrice Rossi},
-  year = 	{2011},
-  edition = {3rd},
-  note = 	{Version 1.15. {ISBN} 0954612078},
+  year = 	{2010},
+  edition =     {3rd},
+  note = 	{Version 1.14. {ISBN} 0954612078},
   url = 	{http://www.gnu.org/software/gsl}
 }
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/beta.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/beta.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/beta.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // beta.h: Rcpp R/C++ interface class library -- beta distribution
 //
-// Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,6 +22,6 @@
 #ifndef Rcpp__stats__beta_h
 #define Rcpp__stats__beta_h
 
-RCPP_DPQ_2(beta,R::Rf_dbeta,R::Rf_pbeta,R::Rf_qbeta)
+RCPP_DPQ_2(beta,::Rf_dbeta,::Rf_pbeta,::Rf_qbeta)
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/stats/binom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/binom.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/binom.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // binom.h: Rcpp R/C++ interface class library --
 //
-// Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,6 +22,6 @@
 #ifndef Rcpp__stats__binom_h
 #define Rcpp__stats__binom_h
 
-RCPP_DPQ_2(binom,R::Rf_dbinom,R::Rf_pbinom,R::Rf_qbinom)
+RCPP_DPQ_2(binom,::Rf_dbinom,::Rf_pbinom,::Rf_qbinom)
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/cauchy.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // cauchy.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -26,24 +26,24 @@
 namespace stats{
 
 inline double dcauchy_0(double x, int give_log){
-	return R::Rf_dcauchy(x,0.0,1.0, give_log) ;
+	return ::Rf_dcauchy(x,0.0,1.0, give_log) ;
 }
 inline double dcauchy_1(double x, double location, int give_log){
-	return R::Rf_dcauchy(x,location,1.0, give_log) ;
+	return ::Rf_dcauchy(x,location,1.0, give_log) ;
 }
 
 inline double pcauchy_0(double x, int lower_tail, int log_p){
-	return R::Rf_pcauchy(x,0.0,1.0,lower_tail, log_p) ;
+	return ::Rf_pcauchy(x,0.0,1.0,lower_tail, log_p) ;
 }
 inline double pcauchy_1(double x, double location, int lower_tail, int log_p){
-	return R::Rf_pcauchy(x,location,1.0,lower_tail, log_p) ;
+	return ::Rf_pcauchy(x,location,1.0,lower_tail, log_p) ;
 }
 
 inline double qcauchy_0(double p, int lower_tail, int log_p){
-	return R::Rf_qcauchy(p, 0.0, 1.0, lower_tail, log_p ) ;
+	return ::Rf_qcauchy(p, 0.0, 1.0, lower_tail, log_p ) ;
 }
 inline double qcauchy_1(double p, double location, int lower_tail, int log_p){
-	return R::Rf_qcauchy(p, location, 1.0, lower_tail, log_p ) ;
+	return ::Rf_qcauchy(p, location, 1.0, lower_tail, log_p ) ;
 }
 
 } // stats
@@ -52,7 +52,7 @@
 
 RCPP_DPQ_0(cauchy,Rcpp::stats::dcauchy_0,Rcpp::stats::pcauchy_0,Rcpp::stats::qcauchy_0)
 RCPP_DPQ_1(cauchy,Rcpp::stats::dcauchy_1,Rcpp::stats::pcauchy_1,Rcpp::stats::qcauchy_1)
-RCPP_DPQ_2(cauchy,R::Rf_dcauchy,R::Rf_pcauchy,R::Rf_qcauchy)
+RCPP_DPQ_2(cauchy,::Rf_dcauchy,::Rf_pcauchy,::Rf_qcauchy)
 
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/stats/chisq.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/chisq.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/chisq.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // chisq.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__chisq_h
 #define Rcpp__stats__chisq_h
 
-RCPP_DPQ_1(chisq,R::Rf_dchisq,R::Rf_pchisq,R::Rf_qchisq)
+RCPP_DPQ_1(chisq,::Rf_dchisq,::Rf_pchisq,::Rf_qchisq)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/exp.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/exp.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/exp.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -5,7 +5,7 @@
 //
 // exp.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -78,17 +78,17 @@
 // we cannot use the RCPP_DPQ_1 macro here because of rate and shape
 template <bool NA, typename T>
 inline stats::D1<REALSXP,NA,T> dexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape, bool log = false ) {
-	return stats::D1<REALSXP,NA,T>( R::Rf_dexp, x, 1.0/shape, log ); 
+	return stats::D1<REALSXP,NA,T>( ::Rf_dexp, x, 1.0/shape, log ); 
 }
 
 template <bool NA, typename T>
 inline stats::P1<REALSXP,NA,T> pexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape, bool lower = true, bool log = false ) {
-	return stats::P1<REALSXP,NA,T>( R::Rf_pexp, x, 1.0/shape, lower, log ); 
+	return stats::P1<REALSXP,NA,T>( ::Rf_pexp, x, 1.0/shape, lower, log ); 
 }
 
 template <bool NA, typename T>
 inline stats::Q1<REALSXP,NA,T> qexp( const Rcpp::VectorBase<REALSXP,NA,T>& x, double shape, bool lower = true, bool log = false ) {
-	return stats::Q1<REALSXP,NA,T>( R::Rf_qexp, x, 1.0/shape, lower, log ); 
+	return stats::Q1<REALSXP,NA,T>( ::Rf_qexp, x, 1.0/shape, lower, log ); 
 }
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/f.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/f.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/f.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // f.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__f_h
 #define Rcpp__stats__f_h
 
-RCPP_DPQ_2(f,R::Rf_df,R::Rf_pf,R::Rf_qf)
+RCPP_DPQ_2(f,::Rf_df,::Rf_pf,::Rf_qf)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/gamma.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/gamma.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/gamma.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -5,7 +5,7 @@
 //
 // gamma.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -47,18 +47,18 @@
     }
 
     if (shape < 1) {
-    	pr = R::Rf_dpois(shape, x, log_p);
+    	pr = ::Rf_dpois(shape, x, log_p);
 	return log_p ?  pr + ::log(shape/x) : pr*shape/x;
     }
     /* else  shape >= 1 */
-    pr = R::Rf_dpois(shape-1, x, log_p);
+    pr = ::Rf_dpois(shape-1, x, log_p);
     return pr;
 }	
 inline double pgamma_1(double x, double alph, int lower_tail, int log_p){
-	return R::Rf_pgamma(x, alph, 1.0, lower_tail, log_p) ;
+	return ::Rf_pgamma(x, alph, 1.0, lower_tail, log_p) ;
 }	
 inline double qgamma_1(double p, double alpha, int lower_tail, int log_p){
-	return R::Rf_qgamma(p, alpha, 1.0, lower_tail, log_p ); 
+	return ::Rf_qgamma(p, alpha, 1.0, lower_tail, log_p ); 
 }
 
 }
@@ -69,7 +69,7 @@
 
 
 // 2 parameter case
-RCPP_DPQ_2(gamma,R::Rf_dgamma,R::Rf_pgamma,R::Rf_qgamma)
+RCPP_DPQ_2(gamma,::Rf_dgamma,::Rf_pgamma,::Rf_qgamma)
 
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/stats/geom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/geom.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/geom.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // geom.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__geom_h
 #define Rcpp__stats__geom_h
 
-RCPP_DPQ_1(geom, R::Rf_dgeom, R::Rf_pgeom, R::Rf_qgeom )
+RCPP_DPQ_1(geom, ::Rf_dgeom, ::Rf_pgeom, ::Rf_qgeom )
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/hyper.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/hyper.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/hyper.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // hyper.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__hyper_h
 #define Rcpp__stats__hyper_h
 
-RCPP_DPQ_3(hyper,R::Rf_dhyper,R::Rf_phyper,R::Rf_qhyper)
+RCPP_DPQ_3(hyper,::Rf_dhyper,::Rf_phyper,::Rf_qhyper)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/lnorm.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -5,7 +5,7 @@
 //
 // lnorm.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -94,7 +94,7 @@
 #endif
     R_Q_P01_boundaries(p, 0, ML_POSINF);
 
-    return ::exp(R::Rf_qnorm5(p, 0.0, 1.0, lower_tail, log_p));
+    return ::exp(::Rf_qnorm5(p, 0.0, 1.0, lower_tail, log_p));
 }
 
 inline double qlnorm_1(double p, double meanlog, int lower_tail, int log_p){
@@ -104,7 +104,7 @@
 #endif
     R_Q_P01_boundaries(p, 0, ML_POSINF);
 
-    return ::exp(R::Rf_qnorm5(p, meanlog, 1.0, lower_tail, log_p));
+    return ::exp(::Rf_qnorm5(p, meanlog, 1.0, lower_tail, log_p));
 }
 
 } // stats
@@ -112,7 +112,7 @@
 
 RCPP_DPQ_0(lnorm,Rcpp::stats::dlnorm_0,Rcpp::stats::plnorm_0,Rcpp::stats::qlnorm_0)
 RCPP_DPQ_1(lnorm,Rcpp::stats::dlnorm_1,Rcpp::stats::plnorm_1,Rcpp::stats::qlnorm_1)
-RCPP_DPQ_2(lnorm,R::Rf_dlnorm,R::Rf_plnorm,R::Rf_qlnorm)
+RCPP_DPQ_2(lnorm,::Rf_dlnorm,::Rf_plnorm,::Rf_qlnorm)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/logis.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/logis.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/logis.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // logis.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -130,7 +130,7 @@
 
 RCPP_DPQ_0(logis,Rcpp::stats::dlogis_0,Rcpp::stats::plogis_0,Rcpp::stats::qlogis_0)
 RCPP_DPQ_1(logis,Rcpp::stats::dlogis_1,Rcpp::stats::plogis_1,Rcpp::stats::qlogis_1)
-RCPP_DPQ_2(logis,R::Rf_dlogis,R::Rf_plogis,R::Rf_qlogis)
+RCPP_DPQ_2(logis,::Rf_dlogis,::Rf_plogis,::Rf_qlogis)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbeta.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // nbeta.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__nbeta_h
 #define Rcpp__stats__nbeta_h
 
-RCPP_DPQ_3(nbeta,R::Rf_dnbeta,R::Rf_pbeta,R::Rf_qbeta)
+RCPP_DPQ_3(nbeta,::Rf_dnbeta,::Rf_pbeta,::Rf_qbeta)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbinom.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // nbinom.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__nbinom_h
 #define Rcpp__stats__nbinom_h
 
-RCPP_DPQ_2(nbinom, R::Rf_dnbinom, R::Rf_pnbinom, R::Rf_qnbinom )
+RCPP_DPQ_2(nbinom, ::Rf_dnbinom, ::Rf_pnbinom, ::Rf_qnbinom )
 	
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nbinom_mu.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // nbinom_mu.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__nbinom_mu_h
 #define Rcpp__stats__nbinom_mu_h
 
-RCPP_DPQ_2(nbinom_mu,Rcpp::dnbinom_mu, Rcpp::pnbinom_mu, Rcpp::qnbinom_mu )
+RCPP_DPQ_2(nbinom_mu,::dnbinom_mu, ::pnbinom_mu, ::qnbinom_mu )
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nchisq.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // nchisq.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__nchisq_h
 #define Rcpp__stats__nchisq_h
 
-RCPP_DPQ_2( nchisq, R::Rf_dnchisq, R::Rf_pnchisq, R::Rf_qnchisq )
+RCPP_DPQ_2( nchisq, ::Rf_dnchisq, ::Rf_pnchisq, ::Rf_qnchisq )
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nf.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nf.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nf.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // nf.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__nf_h
 #define Rcpp__stats__nf_h
 
-RCPP_DPQ_3(nf,R::Rf_dnf,R::Rf_pnf,R::Rf_qnf)
+RCPP_DPQ_3(nf,::Rf_dnf,::Rf_pnf,::Rf_qnf)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/norm.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/norm.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/norm.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // norm.h: Rcpp R/C++ interface class library -- normal distribution
 //
-// Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -68,7 +68,7 @@
 	return (x < mu) ? R_DT_0 : R_DT_1;
     x = p;
 
-    R::Rf_pnorm_both(x, &p, &cp, (lower_tail ? 0 : 1), log_p);
+    ::Rf_pnorm_both(x, &p, &cp, (lower_tail ? 0 : 1), log_p);
 
     return(lower_tail ? p : cp);
 }
@@ -88,16 +88,16 @@
 	return (x < 0.0 ) ? R_DT_0 : R_DT_1;
     x = p;
 
-    R::Rf_pnorm_both(x, &p, &cp, (lower_tail ? 0 : 1), log_p);
+    ::Rf_pnorm_both(x, &p, &cp, (lower_tail ? 0 : 1), log_p);
 
     return(lower_tail ? p : cp);
 }
 
 inline double qnorm_1(double p, double mu /*, double sigma [=1.] */, int lower_tail, int log_p){
-	return R::Rf_qnorm5(p, mu, 1.0, lower_tail, log_p ) ;
+	return ::Rf_qnorm5(p, mu, 1.0, lower_tail, log_p ) ;
 }
 inline double qnorm_0(double p /*, double mu [=0.], double sigma [=1.] */, int lower_tail, int log_p){
-	return R::Rf_qnorm5(p, 0.0, 1.0, lower_tail, log_p ) ;
+	return ::Rf_qnorm5(p, 0.0, 1.0, lower_tail, log_p ) ;
 }
 
 } // stats
@@ -105,6 +105,6 @@
 	
 RCPP_DPQ_0(norm, Rcpp::stats::dnorm_0, Rcpp::stats::pnorm_0, Rcpp::stats::qnorm_0 )
 RCPP_DPQ_1(norm, Rcpp::stats::dnorm_1, Rcpp::stats::pnorm_1, Rcpp::stats::qnorm_1 )
-RCPP_DPQ_2(norm, R::Rf_dnorm4, R::Rf_pnorm5, R::Rf_qnorm5 )
+RCPP_DPQ_2(norm, ::Rf_dnorm4, ::Rf_pnorm5, ::Rf_qnorm5 )
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/stats/nt.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/nt.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/nt.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // nt.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,7 +22,7 @@
 #ifndef Rcpp__stats__nt_h
 #define Rcpp__stats__nt_h
 
-RCPP_DPQ_2(t,R::Rf_dt,R::Rf_pt,R::Rf_qt)
+RCPP_DPQ_2(t,::Rf_dt,::Rf_pt,::Rf_qt)
 
 #endif
 

Modified: pkg/Rcpp/inst/include/Rcpp/stats/pois.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/pois.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/pois.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // pois.h: Rcpp R/C++ interface class library --
 //
-// Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -22,6 +22,6 @@
 #ifndef Rcpp__stats__pois_h
 #define Rcpp__stats__pois_h
 
-RCPP_DPQ_1(pois,R::Rf_dpois,R::Rf_ppois,R::Rf_qpois)
+RCPP_DPQ_1(pois,::Rf_dpois,::Rf_ppois,::Rf_qpois)
 
 #endif

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rbeta.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rbeta.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rbeta.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rbeta.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -28,7 +28,7 @@
 	// about the need to call GetRNGstate() and PutRNGstate() when using 
 	// the random number generators provided by R.
 	inline NumericVector rbeta( int n, double a, double b ){
-		return NumericVector( n, R::Rf_rbeta, a, b ) ;
+		return NumericVector( n, ::Rf_rbeta, a, b ) ;
 	}
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rbinom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rbinom.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rbinom.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rbinom.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -28,7 +28,7 @@
 	// about the need to call GetRNGstate() and PutRNGstate() when using 
 	// the random number generators provided by R.
 	inline NumericVector rbinom( int n, double nin, double pp ){
-		return NumericVector( n, R::Rf_rbinom, nin, pp) ;
+		return NumericVector( n, ::Rf_rbinom, nin, pp) ;
 	}
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rchisq.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rchisq.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rchisq.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rchisq.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -31,7 +31,7 @@
 			ChisqGenerator( double df_ ) : df_2(df_ / 2.0) {}
 			
 			inline double operator()() const {
-				return R::Rf_rgamma( df_2, 2.0 ) ; 
+				return ::Rf_rgamma( df_2, 2.0 ) ; 
 			}
 			
 		private:

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rf.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rf.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rf.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rf.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -35,7 +35,7 @@
 			inline double operator()() const {
 				// here we know that both n1 and n2 are finite
 				// return ( ::rchisq( n1 ) / n1 ) / ( ::rchisq( n2 ) / n2 );
-				return ratio * R::Rf_rgamma( n1__2, 2.0 ) / R::Rf_rgamma( n2__2, 2.0 ) ;
+				return ratio * ::Rf_rgamma( n1__2, 2.0 ) / ::Rf_rgamma( n2__2, 2.0 ) ;
 			}
 	
 		private:
@@ -50,7 +50,7 @@
 	
 			inline double operator()() const {
 				// return n2  / ::rchisq( n2 ) ;
-				return n2 / R::Rf_rgamma( n2__2, 2.0 ) ;
+				return n2 / ::Rf_rgamma( n2__2, 2.0 ) ;
 			}
 	
 		private:
@@ -65,7 +65,7 @@
 	
 			inline double operator()() const {
 				// return ::rchisq( n1 ) / n1 ;
-				return R::Rf_rgamma( n1__2, 2.0 ) / n1 ;
+				return ::Rf_rgamma( n1__2, 2.0 ) / n1 ;
 			}
 	
 		private:

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rgamma.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rgamma.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rgamma.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rgammah: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -33,7 +33,7 @@
 			return NumericVector( n, R_NaN ) ;
 		}
 		if( a == 0. ) return NumericVector(n, 0. ) ;
-		return NumericVector( n, R::Rf_rgamma, a, scale ) ;
+		return NumericVector( n, ::Rf_rgamma, a, scale ) ;
 	}
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rgeom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rgeom.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rgeom.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rgeom.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -31,7 +31,7 @@
 			GeomGenerator( double p ) : lambda( (1-p)/p  ) {}
 	
 			inline double operator()() const {
-				return R::Rf_rpois(exp_rand() * lambda); 
+				return ::Rf_rpois(exp_rand() * lambda); 
 			}
 	
 		private:

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rhyper.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rhyper.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rhyper.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rhyper.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -28,7 +28,7 @@
 	// about the need to call GetRNGstate() and PutRNGstate() when using 
 	// the random number generators provided by R.
 	inline NumericVector rhyper( int n, double nn1, double nn2, double kk ){
-		return NumericVector( n, R::Rf_rhyper, nn1, nn2, kk ) ;
+		return NumericVector( n, ::Rf_rhyper, nn1, nn2, kk ) ;
 	}
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rnbinom.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -32,7 +32,7 @@
 				siz(siz_), lambda( (1-prob_)/prob_ ) {}
 	
 			inline double operator()() const {
-				return R::Rf_rpois( R::Rf_rgamma( siz, lambda ) ) ; 
+				return ::Rf_rpois( ::Rf_rgamma( siz, lambda ) ) ; 
 			}
 	
 		private:

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom_mu.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom_mu.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rnbinom_mu.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rnbinom_mu.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -32,7 +32,7 @@
 				siz(siz_), lambda( mu_ / siz_ ) {}
 	
 			inline double operator()() const {
-				return R::Rf_rpois( R::Rf_rgamma( siz, lambda ) ) ; 
+				return ::Rf_rpois( ::Rf_rgamma( siz, lambda ) ) ; 
 			}
 	
 		private:

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rnchisq.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rnchisq.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rnchisq.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rnchisq.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -32,13 +32,13 @@
 				df(df_), df_2(df_ / 2.0), lambda_2(lambda_ / 2.0 ) {}
 	
 			inline double operator()() const {
-				double r = R::Rf_rpois( lambda_2 ) ;
+				double r = ::Rf_rpois( lambda_2 ) ;
 				// if( r > 0.0 ) r = Rf_rchisq( 2. * r ) ;
 				// replace by so that we can skip the tests in rchisq
 				// because there is no point in doing them as we know the 
 				// outcome for sure
-				if( r > 0.0 ) r = R::Rf_rgamma( r, 2. ) ;
-				if (df > 0.) r += R::Rf_rgamma( df_2, 2.);
+				if( r > 0.0 ) r = ::Rf_rgamma( r, 2. ) ;
+				if (df > 0.) r += ::Rf_rgamma( df_2, 2.);
 				return r;
 			}
 	

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rpois.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rpois.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rpois.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rpois.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -28,7 +28,7 @@
 	// about the need to call GetRNGstate() and PutRNGstate() when using 
 	// the random number generators provided by R.
 	inline NumericVector rpois( int n, double mu ){
-		return NumericVector( n, R::Rf_rpois, mu ) ;
+		return NumericVector( n, ::Rf_rpois, mu ) ;
 	}
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rsignrank.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rsignrank.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rsignrank.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rsignrank.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -28,7 +28,7 @@
 	// about the need to call GetRNGstate() and PutRNGstate() when using 
 	// the random number generators provided by R.
 	inline NumericVector rsignrank( int n, double nn ){
-		return NumericVector( n, R::Rf_rsignrank, nn ) ;
+		return NumericVector( n, ::Rf_rsignrank, nn ) ;
 	}
 
 } // Rcpp

Modified: pkg/Rcpp/inst/include/Rcpp/stats/random/rt.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/stats/random/rt.h	2012-10-26 19:12:45 UTC (rev 3842)
+++ pkg/Rcpp/inst/include/Rcpp/stats/random/rt.h	2012-10-26 19:42:05 UTC (rev 3843)
@@ -2,7 +2,7 @@
 //
 // rt.h: Rcpp R/C++ interface class library -- 
 //
-// Copyright (C) 2010 - 2012  Douglas Bates, Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -38,7 +38,7 @@
 				// return num / sqrt(rchisq(df) / df);
[TRUNCATED]

To get the complete diff run:
    svnlook diff /svnroot/rcpp -r 3843


More information about the Rcpp-commits mailing list