Skip to content

Commit 328d264

Browse files
authored
replace some more container_get_cardinality() (#715)
1 parent d97e2eb commit 328d264

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/roaring.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ static void insert_flipped_container(roaring_array_t *ans_arr,
19201920
container_not_range(container_to_flip, ctype_in, (uint32_t)lb_start,
19211921
(uint32_t)(lb_end + 1), &ctype_out);
19221922

1923-
if (container_get_cardinality(flipped_container, ctype_out))
1923+
if (container_nonzero_cardinality(flipped_container, ctype_out))
19241924
ra_insert_new_key_value_at(ans_arr, -j - 1, hb, flipped_container,
19251925
ctype_out);
19261926
else {
@@ -1946,7 +1946,7 @@ static void inplace_flip_container(roaring_array_t *x1_arr, uint16_t hb,
19461946
container_to_flip, ctype_in, (uint32_t)lb_start,
19471947
(uint32_t)(lb_end + 1), &ctype_out);
19481948
// if a new container was created, the old one was already freed
1949-
if (container_get_cardinality(flipped_container, ctype_out)) {
1949+
if (container_nonzero_cardinality(flipped_container, ctype_out)) {
19501950
ra_set_container_at_index(x1_arr, i, flipped_container, ctype_out);
19511951
} else {
19521952
container_free(flipped_container, ctype_out);
@@ -1973,7 +1973,7 @@ static void insert_fully_flipped_container(roaring_array_t *ans_arr,
19731973
ra_get_container_at_index(x1_arr, (uint16_t)i, &ctype_in);
19741974
flipped_container =
19751975
container_not(container_to_flip, ctype_in, &ctype_out);
1976-
if (container_get_cardinality(flipped_container, ctype_out))
1976+
if (container_nonzero_cardinality(flipped_container, ctype_out))
19771977
ra_insert_new_key_value_at(ans_arr, -j - 1, hb, flipped_container,
19781978
ctype_out);
19791979
else {
@@ -1996,7 +1996,7 @@ static void inplace_fully_flip_container(roaring_array_t *x1_arr, uint16_t hb) {
19961996
flipped_container =
19971997
container_inot(container_to_flip, ctype_in, &ctype_out);
19981998

1999-
if (container_get_cardinality(flipped_container, ctype_out)) {
1999+
if (container_nonzero_cardinality(flipped_container, ctype_out)) {
20002000
ra_set_container_at_index(x1_arr, i, flipped_container, ctype_out);
20012001
} else {
20022002
container_free(flipped_container, ctype_out);

0 commit comments

Comments
 (0)