Skip to content

Commit

Permalink
upgrade croaring to v2.0.3 (#10)
Browse files Browse the repository at this point in the history
* upgrade croaring to v2.0.3

files copied from https://github.com/RoaringBitmap/CRoaring/releases/tag/v2.0.3 without modification

* update metadata
  • Loading branch information
smmathews-brandwatch authored Oct 10, 2023
1 parent ff6da45 commit 8812a41
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 26 deletions.
2 changes: 1 addition & 1 deletion META.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"abstract": "A Roaring Bitmap data type",
"description": "This library contains a single PostgreSQL extension, a Roaring Bitmap data type called 'roaringbitmap', along with some convenience opperators and functions for constructing and handling Roaring Bitmap.",
"version": "0.6.0",
"croaring_version": "2.0.2",
"croaring_version": "2.0.3",
"license": "apache_2_0",
"provides": {
"pg_roaringbitmap": {
Expand Down
14 changes: 11 additions & 3 deletions roaring.c
Original file line number Diff line number Diff line change
@@ -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).
Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand Down
44 changes: 22 additions & 22 deletions roaring.h
Original file line number Diff line number Diff line change
@@ -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).
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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 <machine/endian.h>
#elif defined(sun) || defined(__sun) // defined(__APPLE__) || defined(__FreeBSD__)
#include <sys/byteorder.h>
#else // defined(__APPLE__) || defined(__FreeBSD__)

#ifdef __has_include
#if __has_include(<endian.h>)
#else
#if defined(__APPLE__) || defined(__FreeBSD__) // defined __BYTE_ORDER__ && defined __ORDER_BIG_ENDIAN__
#include <machine/endian.h>
#elif defined(sun) || defined(__sun) // defined(__APPLE__) || defined(__FreeBSD__)
#include <sys/byteorder.h>
#else // defined(__APPLE__) || defined(__FreeBSD__)

#ifdef __has_include
#if __has_include(<endian.h>)
#include <endian.h>
#endif //__has_include(<endian.h>)
#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
Expand Down

0 comments on commit 8812a41

Please sign in to comment.