Ensure cc() passes with bit64 loaded. Use base::is.double() explicitly.

Rdatatable · May 10, 2015 · b6ea972 · b6ea972
1 parent 0447654
commit b6ea972
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/R/bmerge.R b/R/bmerge.R
@@ -67,7 +67,7 @@ bmerge <- function(i, x, leftcols, rightcols, io, xo, roll, rollends, nomatch, v
         # NOTE: bit64::is.double(int64) returns FALSE.. but base::is.double returns TRUE
         is.int64 <- function(x) inherits(x, 'integer64')
         is.strictlydouble <- function(x) !is.int64(x) && is.double(x)
-        if (is.integer(x[[rc]]) && (is.double(i[[lc]]) || is.logical(i[[lc]]))) {
+        if (is.integer(x[[rc]]) && (base::is.double(i[[lc]]) || is.logical(i[[lc]]))) {
             # TO DO: add warning if reallyreal about loss of precision
             # or could coerce in binary search on the fly, at cost
             if (verbose) cat("Coercing ", typeof(i[[lc]])," column i.'",icnam,"' to integer to match type of x.'",xcnam,"'. Please avoid coercion for efficiency.\n",sep="")