Skip to content

Commit 0db94ad

Browse files
committed
Merge pull request #196 from RcppCore/bugfix/binom_mu
correct call to ?nbinom_mu variants -- commented out while we wait for R 3.1.2 to support it
2 parents ddf6550 + 718bf4e commit 0db94ad

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2014-10-29 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* inst/include/Rcpp/Rmath.h: Comment out R::[dpqr]nbinom_mu functions as
4+
not declared by R with Rf_* name-mapping prefixes
5+
6+
2014-10-17 Chenliang Xu <luckyrand@gmail.com>
7+
8+
* R/Attributes: Enable scanning of header files
9+
110
2014-10-03 JJ Allaire <jj@rstudio.org>
211

312
* R/Attributes.R: Only look for plugins in the package's namespace

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Rcpp
22
Title: Seamless R and C++ Integration
3-
Version: 0.11.3
4-
Date: 2014-09-27
3+
Version: 0.11.3.1
4+
Date: 2014-10-29
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey,
66
Douglas Bates, and John Chambers
77
Maintainer: Dirk Eddelbuettel <edd@debian.org>

inst/include/Rcpp/Rmath.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,12 @@ namespace R {
131131
inline double qnbinom(double p, double sz, double pb, int lt, int lg) { return ::Rf_qnbinom(p, sz, pb, lt, lg); }
132132
inline double rnbinom(double sz, double pb) { return ::Rf_rnbinom(sz, pb); }
133133

134-
inline double dnbinom_mu(double x, double sz, double mu, int lg) { return ::Rf_dnbinom(x, sz, mu, lg); }
135-
inline double pnbinom_mu(double x, double sz, double mu, int lt, int lg) { return ::Rf_pnbinom(x, sz, mu, lt, lg); }
136-
inline double qnbinom_mu(double x, double sz, double mu, int lt, int lg) { return ::Rf_qnbinom(x, sz, mu, lt, lg); }
137-
inline double rnbinom_mu(double sz, double mu) { return ::Rf_rnbinom(sz, mu); }
134+
#if 0
135+
inline double dnbinom_mu(double x, double sz, double mu, int lg) { return ::Rf_dnbinom_mu(x, sz, mu, lg); }
136+
inline double pnbinom_mu(double x, double sz, double mu, int lt, int lg) { return ::Rf_pnbinom_mu(x, sz, mu, lt, lg); }
137+
inline double qnbinom_mu(double x, double sz, double mu, int lt, int lg) { return ::Rf_qnbinom_mu(x, sz, mu, lt, lg); }
138+
inline double rnbinom_mu(double sz, double mu) { return ::Rf_rnbinom_mu(sz, mu); }
139+
#endif
138140

139141
/* Poisson Distribution */
140142
inline double dpois(double x, double lb, int lg) { return ::Rf_dpois(x, lb, lg); }

0 commit comments

Comments
 (0)