From 97f7f2c25eed300eac68ac7527bef88c42f49234 Mon Sep 17 00:00:00 2001 From: smmathews-bw-boston Date: Tue, 10 Oct 2023 09:53:14 -0400 Subject: [PATCH] upgrade croaring to v2.0.3 files copied from https://github.com/RoaringBitmap/CRoaring/releases/tag/v2.0.3 without modification --- roaring.c | 14 +++++++++++--- roaring.h | 44 ++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/roaring.c b/roaring.c index d93d861..fd4af55 100644 --- a/roaring.c +++ b/roaring.c @@ -1,5 +1,5 @@ // !!! DO NOT EDIT - THIS IS AN AUTO-GENERATED FILE !!! -// Created by amalgamation.sh on 2023-09-27T16:30:23Z +// Created by amalgamation.sh on 2023-10-08T18:43:27Z /* * The CRoaring project is under a dual license (Apache/MIT). @@ -16409,7 +16409,11 @@ return ROARING_SUPPORTS_AVX2 | ROARING_SUPPORTS_AVX512; #elif defined(__AVX2__) int croaring_hardware_support(void) { -static int support = 0xFFFFFFF; +static +#if CROARING_ATOMIC_IMPL == CROARING_ATOMIC_IMPL_C +_Atomic +#endif +int support = 0xFFFFFFF; if(support == 0xFFFFFFF) { bool avx512_support = false; #if CROARING_COMPILER_SUPPORTS_AVX512 @@ -16423,7 +16427,11 @@ return support; #else int croaring_hardware_support(void) { -static int support = 0xFFFFFFF; +static +#if CROARING_ATOMIC_IMPL == CROARING_ATOMIC_IMPL_C +_Atomic +#endif +int support = 0xFFFFFFF; if(support == 0xFFFFFFF) { bool has_avx2 = (croaring_detect_supported_architectures() & CROARING_AVX2) == CROARING_AVX2; bool has_avx512 = false; diff --git a/roaring.h b/roaring.h index 6c2ff00..ef873a9 100644 --- a/roaring.h +++ b/roaring.h @@ -1,5 +1,5 @@ // !!! DO NOT EDIT - THIS IS AN AUTO-GENERATED FILE !!! -// Created by amalgamation.sh on 2023-09-27T16:30:23Z +// Created by amalgamation.sh on 2023-10-08T18:43:27Z /* * The CRoaring project is under a dual license (Apache/MIT). @@ -58,11 +58,11 @@ // /include/roaring/roaring_version.h automatically generated by release.py, do not change by hand #ifndef ROARING_INCLUDE_ROARING_VERSION #define ROARING_INCLUDE_ROARING_VERSION -#define ROARING_VERSION "2.0.2" +#define ROARING_VERSION "2.0.3" enum { ROARING_VERSION_MAJOR = 2, ROARING_VERSION_MINOR = 0, - ROARING_VERSION_REVISION = 2 + ROARING_VERSION_REVISION = 3 }; #endif // ROARING_INCLUDE_ROARING_VERSION /* end file include/roaring/roaring_version.h */ @@ -553,31 +553,31 @@ static inline int roaring_hamming(uint64_t x) { #define CROARING_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) #elif defined(_WIN32) #define CROARING_IS_BIG_ENDIAN 0 -#else -#if defined(__APPLE__) || defined(__FreeBSD__) // defined __BYTE_ORDER__ && defined __ORDER_BIG_ENDIAN__ -#include -#elif defined(sun) || defined(__sun) // defined(__APPLE__) || defined(__FreeBSD__) -#include -#else // defined(__APPLE__) || defined(__FreeBSD__) - -#ifdef __has_include -#if __has_include() + #else + #if defined(__APPLE__) || defined(__FreeBSD__) // defined __BYTE_ORDER__ && defined __ORDER_BIG_ENDIAN__ + #include + #elif defined(sun) || defined(__sun) // defined(__APPLE__) || defined(__FreeBSD__) + #include + #else // defined(__APPLE__) || defined(__FreeBSD__) + + #ifdef __has_include + #if __has_include() #include #endif //__has_include() -#endif //__has_include + #endif //__has_include -#endif // defined(__APPLE__) || defined(__FreeBSD__) + #endif // defined(__APPLE__) || defined(__FreeBSD__) -#ifndef !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) -#define CROARING_IS_BIG_ENDIAN 0 -#endif + #ifndef !defined(__BYTE_ORDER__) || !defined(__ORDER_LITTLE_ENDIAN__) + #define CROARING_IS_BIG_ENDIAN 0 + #endif -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -#define CROARING_IS_BIG_ENDIAN 0 -#else // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -#define CROARING_IS_BIG_ENDIAN 1 -#endif // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define CROARING_IS_BIG_ENDIAN 0 + #else // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + #define CROARING_IS_BIG_ENDIAN 1 + #endif // __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #endif // Defines for the possible CROARING atomic implementations