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

Fix compiler warning on CRAN #231

Merged
merged 3 commits into from
Nov 28, 2023
+10 −6
Merged

Fix compiler warning on CRAN #231

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
788a023
Attempt to fix compiler warning on CRAN (Issue #230)
kbroman Nov 28, 2023
ac484b9
Add cran to branches checked in github action
kbroman Nov 28, 2023
a8f28f8
Bump version for submission to CRAN
kbroman Nov 28, 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
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, master, cran]
pull_request:
branches: [main, master]
branches: [main, master, cran]

name: R-CMD-check

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,6 +1,6 @@
Package: qtl2
Version: 0.33-6
Date: 2023-11-12
Version: 0.34
Date: 2023-11-28
Title: Quantitative Trait Locus Mapping in Experimental Crosses
Description: Provides a set of tools to perform quantitative
trait locus (QTL) analysis in experimental crosses. It is a
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## qtl2 0.33-6 (2023-11-12)
## qtl2 0.34 (2023-11-28)

### Major changes

Expand All @@ -20,6 +20,10 @@
- More fully explain the use of weights in `est_herit()` and
`scan1()`. (Issue #221)

### Bug fixes

- Deal with new compiler warning on CRAN. (Issue #230)


## qtl2 0.32 (2023-04-21)

Expand Down
2 changes: 1 addition & 1 deletion src/r_message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void r_message(std::string text)
void r_warning(std::string text)
{
const char *text_c = text.c_str();
Rf_warning(text_c);
Rf_warning("%s", text_c);
}

// Following based on code from Luke Miratrix, http://bit.ly/rcpp_assert
Expand Down