Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

1. Supplying `keep.names=` to `as.integer64()` now emits a warning, which will become an error in the next release.

## BUG FIXES

1. Fixed handling of `__has_builtin` preprocessor macro where it's absent (e.g. GCC < 10; #388).

## NOTES

1. The R version dependency has been bumped from 3.5.0 (2018) to 3.6.0 (2019).
Expand Down
6 changes: 5 additions & 1 deletion src/integer64.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ static inline bool is_na64(long long x) {
#define BITSTRING_OVERFLOW_WARNING "bitstrings longer than 64 bytes converted to NA, multibyte-characters not allowed"
#define INTEGER64_NA_COERCION_WARNING "NAs introduced by coercion to integer64 range"

#if (defined(__GNUC__) && __GNUC__ >= 5) || (defined(__has_builtin) && __has_builtin(__builtin_add_overflow))
#ifndef __has_builtin
#define __has_builtin(x) 0
#endif

#if (defined(__GNUC__) && __GNUC__ >= 5) || __has_builtin(__builtin_add_overflow)
#define HAVE_BUILTIN_OVERFLOW 1
#endif

Expand Down
Loading