merged from branch

Author: eddelbuettel

ChangeLog

@@ -3,6 +3,10 @@
         * inst/unitTests/RcppTestA: Rename to inst/unitTests/testRcppPackage
         * inst/unitTests/testRcppPackage: Updated throughout
 
+        * inst/include/Rcpp/Rmath.h: As suggested by Kevin, test for R_VERSION
+        via #define to conditon on R >= 3.1.2 -- this does not require a hard
+        constraint in DESCRIPTION yet on newer R will get R::[dpqr]nbinom_mu()
+
 2014-11-01  Dirk Eddelbuettel  <edd@debian.org>
 
         * src/api.cpp: Do not include execinfo.h on AIX, per r-devel discussion

inst/NEWS.Rd

@@ -8,6 +8,8 @@
     \itemize{
       \item The \code{ListOf<T>} class gains the \code{.attr} and
       \code{.names} methods common to other Rcpp vectors.
+      \item The \code{[dpqr]nbinom_mu()} scalar functions are now available via 
+      the \code{R::} namespace when R 3.1.2 or newer is used.
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/Rmath.h

@@ -131,7 +131,7 @@ namespace R {
     inline double qnbinom(double p, double sz, double pb, int lt, int lg)	{ return ::Rf_qnbinom(p, sz, pb, lt, lg); }
     inline double rnbinom(double sz, double pb)					{ return ::Rf_rnbinom(sz, pb); }
 
-#if 0
+#if R_VERSION >= R_Version(3, 1, 2)
     inline double dnbinom_mu(double x, double sz, double mu, int lg)		{ return ::Rf_dnbinom_mu(x, sz, mu, lg); }
     inline double pnbinom_mu(double x, double sz, double mu, int lt, int lg)	{ return ::Rf_pnbinom_mu(x, sz, mu, lt, lg); }
     inline double qnbinom_mu(double x, double sz, double mu, int lt, int lg)	{ return ::Rf_qnbinom_mu(x, sz, mu, lt, lg); }