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 incorrect format usage #312

Merged
merged 1 commit into from
Feb 23, 2024
Merged

Fix incorrect format usage #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: odin
Title: ODE Generation and Integration
Version: 1.5.9
Version: 1.5.10
Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
email = "[email protected]"),
person("Thibaut", "Jombart", role = "ctb"),
Expand Down
8 changes: 4 additions & 4 deletions inst/library.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int user_get_scalar_int(SEXP user, const char *name,
SEXP el = user_list_element(user, name);
if (el != R_NilValue) {
if (length(el) != 1) {
Rf_error("Expected scalar integer for '%d'", name);
Rf_error("Expected scalar integer for '%s'", name);
}
if (TYPEOF(el) == REALSXP) {
double tmp = REAL(el)[0];
Expand Down Expand Up @@ -100,7 +100,7 @@ void* user_get_array(SEXP user, bool is_integer, void * previous,
Rf_error("Expected length %d value for '%s'", dim_expected, name);
} else {
Rf_error("Incorrect size of dimension %d of '%s' (expected %d)",
i + 1, name, dim_expected);
(int)i + 1, name, dim_expected);
}
}
}
Expand Down Expand Up @@ -345,11 +345,11 @@ void interpolate_check_y(size_t nx, size_t ny, size_t i, const char *name_arg, c
if (i == 0) {
// vector case
Rf_error("Expected %s to have length %d (for '%s')",
name_arg, nx, name_target);
name_arg, (int)nx, name_target);
} else {
// array case
Rf_error("Expected dimension %d of %s to have size %d (for '%s')",
i, name_arg, nx, name_target);
(int)i, name_arg, (int)nx, name_target);
}
}
}
Expand Down
Loading