Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor polish on one Rd file and new micro release #1282

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Minor polish on one Rd file and new micro release #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1fb42d
Correct one stray Rd macro
eddelbuettel Oct 27, 2023
7b16ad8
Roll micro version
eddelbuettel Oct 27, 2023
acb1f10
Also update Rd file
eddelbuettel Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2023-10-27 Dirk Eddelbuettel <[email protected]>

* DESCRIPTION (Version, Date): Roll micro version
* inst/include/Rcpp/config.h (RCPP_DEV_VERSION): Idem

* R/tools.R: Correct missing Rd macros (spotted by R-devel CMD check)

2023-10-22 Aaron Lun <[email protected]>

* inst/include/Rcpp/vector/MatrixColumn.h: Cast integer index
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.11.2
Date: 2023-08-31
Version: 1.0.11.3
Date: 2023-10-27
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Inaki Ucar, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion R/tools.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ asBuildPath <- function(path) {
##' Helper function to report the package version of the R installation.
##'
##' While \code{packageVersion(Rcpp)} exports the version registers in
##' {DESCRIPTION}, this version does get incremented more easily
##' \code{DESCRIPTION}, this version does get incremented more easily
##' during development and can therefore be higher than the released
##' version. The actual \code{#define} long used at the C++ level
##' corresponds more to an \sQuote{API Version} which is now provided
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.11"

// the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it)
#define RCPP_DEV_VERSION RcppDevVersion(1,0,11,2)
#define RCPP_DEV_VERSION_STRING "1.0.11.2"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,11,3)
#define RCPP_DEV_VERSION_STRING "1.0.11.3"

#endif
2 changes: 1 addition & 1 deletion man/getRcppVersion.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.