From 23f0ae51477c08d7329b98f1440ae9cccaccb823 Mon Sep 17 00:00:00 2001 From: Tyge Løvset Date: Mon, 1 Mar 2021 17:36:16 +0100 Subject: Cleanup c++ compilation of cbits.h --- examples/stc_astar.c | 2 +- stc/cbits.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/stc_astar.c b/examples/stc_astar.c index cdf1ff3c..d096c9fc 100644 --- a/examples/stc_astar.c +++ b/examples/stc_astar.c @@ -19,7 +19,7 @@ typedef struct { MazePoint mpoint_init(int x, int y, int width) { - return (MazePoint) { x, y, 0, width }; + MazePoint p = { x, y, 0, width }; return p; } int diff --git a/stc/cbits.h b/stc/cbits.h index 2eab9075..8bd30aaa 100644 --- a/stc/cbits.h +++ b/stc/cbits.h @@ -110,7 +110,7 @@ STC_INLINE void cbits_flip(cbits_t *self, size_t i) { self->_arr[i >> 6] ^= 1ull << (i & 63); } STC_INLINE void cbits_set_all(cbits_t *self, bool value) { - memset(self->_arr, -value, ((self->size + 63) >> 6) * 8); + memset(self->_arr, -(int)value, ((self->size + 63) >> 6) * 8); } STC_INLINE void cbits_set_all64(cbits_t *self, uint64_t pattern) { size_t n = (self->size + 63) >> 6; @@ -198,7 +198,7 @@ STC_DEF void cbits_resize(cbits_t* self, size_t size, bool value) { self->_arr = (uint64_t *) c_realloc(self->_arr, new_n * 8); self->size = size; if (new_n >= old_n) { - memset(self->_arr + old_n, -value, (new_n - old_n) * 8); + memset(self->_arr + old_n, -(int)value, (new_n - old_n) * 8); if (old_n > 0) { uint64_t m = (1ull << (osize & 63)) - 1; /* mask */ value ? (self->_arr[old_n - 1] |= ~m) : (self->_arr[old_n - 1] &= m); -- cgit v1.2.3