Skip to content

Commit e113c1a

Browse files
committed
more idiomatic call, new minor version
1 parent 60fe684 commit e113c1a

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2019-04-26 Dirk Eddelbuettel <[email protected]>
2+
3+
* DESCRIPTION (Version, Date): Roll minor version
4+
5+
* R/tools.R (getRcppVersion): More idiomatic code
6+
17
2019-04-25 Dirk Eddelbuettel <[email protected]>
28

39
* R/tools.R (getRcppVersion): Export R (and dev) package version

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: 1.0.1.2
4-
Date: 2019-03-20
3+
Version: 1.0.1.3
4+
Date: 2019-04-26
55
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
66
Nathan Russell, Douglas Bates and John Chambers
77
Maintainer: Dirk Eddelbuettel <[email protected]>

R/tools.R

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ asBuildPath <- function(path) {
7070
##' \code{\link{Rcpp.package.skeleton}}
7171
##' @examples getRcppVersion()
7272
getRcppVersion <- function(devel = FALSE) {
73-
rcpp <- .Call("getRcppVersionStrings")[if(devel) 2 else 1]
74-
.make_numeric_version(rcpp,
75-
TRUE,
76-
.standard_regexps()$valid_package_version,
77-
"package_version")
73+
rcpp <- .Call("getRcppVersionStrings", package="Rcpp")
74+
package_version(rcpp[if(devel) 2 else 1])
7875
}

0 commit comments

Comments
 (0)