Merge pull request #414 from mrc-ide/hotfix-lint

Author: richfitz

.lintr

@@ -1,4 +1,5 @@
 linters: with_defaults(
+    indentation_linter = NULL,
     object_length_linter = NULL,
     object_usage_linter = NULL,
     todo_comment_linter = NULL,

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dust
 Title: Iterate Multiple Realisations of Stochastic Models
-Version: 0.14.9
+Version: 0.14.10
 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
                     email = "[email protected]"),
              person("Alex", "Hill", role = "aut"),
@@ -26,13 +26,13 @@ Language: en-GB
 Requires: R (>= 4.0.0)
 Imports:
     R6,
-    cpp11 (>= 0.4.4),
+    cpp11 (>= 0.4.0),
     glue,
     pkgbuild (>= 1.2.0),
     pkgload,
     withr
 LinkingTo:
-    cpp11
+    cpp11 (>= 0.4.0)
 Suggests:
     bench,
     brio,

inst/include/dust/r/helpers.hpp

@@ -16,6 +16,11 @@
 namespace dust {
 namespace r {
 
+inline bool is_integer_like(double x) {
+  double int_part;
+  return std::modf(x, &int_part) == 0.0;
+}
+
 inline
 cpp11::integers as_integer(cpp11::sexp x, const char * name) {
   if (TYPEOF(x) == INTSXP) {
@@ -26,7 +31,7 @@ cpp11::integers as_integer(cpp11::sexp x, const char * name) {
     cpp11::writable::integers ret = cpp11::writable::integers(len);
     for (size_t i = 0; i < len; ++i) {
       double el = xn[i];
-      if (!cpp11::is_convertible_without_loss_to_integer(el)) {
+      if (!is_integer_like(el)) {
         cpp11::stop("All elements of '%s' must be integer-like",
                     name, i + 1);
       }

inst/include/dust/random/version.hpp

@@ -4,8 +4,8 @@
 
 #define DUST_VERSION_MAJOR 0
 #define DUST_VERSION_MINOR 14
-#define DUST_VERSION_PATCH 9
-#define DUST_VERSION_STRING "0.14.9"
-#define DUST_VERSION_CODE 1409
+#define DUST_VERSION_PATCH 10
+#define DUST_VERSION_STRING "0.14.10"
+#define DUST_VERSION_CODE 1410
 
 #endif