Change tick params for sub-byte arrays to size_t. Change the tick (array index) parameter for 1-bit, 2-bit, and 4-bit integer array manipulation routines from uint32_t to size_t.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/a311c319 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/a311c319 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/a311c319 Branch: refs/heads/master Commit: a311c31918770867929c1174c7d471d36d1c409f Parents: f48cc9e Author: Marvin Humphrey <[email protected]> Authored: Thu Apr 21 17:22:37 2016 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Thu Apr 21 17:22:37 2016 -0700 ---------------------------------------------------------------------- core/Lucy/Util/NumberUtils.cfh | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a311c319/core/Lucy/Util/NumberUtils.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Util/NumberUtils.cfh b/core/Lucy/Util/NumberUtils.cfh index a9cca59..6a36928 100644 --- a/core/Lucy/Util/NumberUtils.cfh +++ b/core/Lucy/Util/NumberUtils.cfh @@ -153,49 +153,49 @@ inert class Lucy::Util::NumberUtils nickname NumUtil { * bit at `tick` is set, false otherwise. */ inert inline bool - u1get(const void *array, uint32_t tick); + u1get(const void *array, size_t tick); /** Interpret `array` as an array of bits; set the bit at * `tick`. */ inert inline void - u1set(void *array, uint32_t tick); + u1set(void *array, size_t tick); /** Interpret `array` as an array of bits; clear the bit at * `tick`. */ inert inline void - u1clear(void *array, uint32_t tick); + u1clear(void *array, size_t tick); /** Interpret `array` as an array of bits; flip the bit at * `tick`. */ inert inline void - u1flip(void *array, uint32_t tick); + u1flip(void *array, size_t tick); /** Interpret `array` as an array of two-bit integers; return * the value at `tick`. */ inert inline uint8_t - u2get(const void *array, uint32_t tick); + u2get(const void *array, size_t tick); /** Interpret `array` as an array of two-bit integers; set the * element at `tick` to `value`. */ inert inline void - u2set(void *array, uint32_t tick, uint8_t value); + u2set(void *array, size_t tick, uint8_t value); /** Interpret `array` as an array of four-bit integers; return * the value at `tick`. */ inert inline uint8_t - u4get(const void *array, uint32_t tick); + u4get(const void *array, size_t tick); /** Interpret `array` as an array of four-bit integers; set the * element at `tick` to `value`. */ inert inline void - u4set(void *array, uint32_t tick, uint8_t value); + u4set(void *array, size_t tick, uint8_t value); } __C__ @@ -437,39 +437,39 @@ lucy_NumUtil_skip_cint(const char **source_ptr) { } static CFISH_INLINE bool -lucy_NumUtil_u1get(const void *array, uint32_t tick) { +lucy_NumUtil_u1get(const void *array, size_t tick) { uint8_t *const u8bits = (uint8_t*)array; - const uint32_t byte_offset = tick >> 3; + const size_t byte_offset = tick >> 3; const unsigned mask = 1 << (tick & 0x7); return !((u8bits[byte_offset] & mask) == 0); } static CFISH_INLINE void -lucy_NumUtil_u1set(void *array, uint32_t tick) { +lucy_NumUtil_u1set(void *array, size_t tick) { uint8_t *const u8bits = (uint8_t*)array; - const uint32_t byte_offset = tick >> 3; + const size_t byte_offset = tick >> 3; const unsigned mask = 1 << (tick & 0x7); u8bits[byte_offset] |= mask; } static CFISH_INLINE void -lucy_NumUtil_u1clear(void *array, uint32_t tick) { +lucy_NumUtil_u1clear(void *array, size_t tick) { uint8_t *const u8bits = (uint8_t*)array; - const uint32_t byte_offset = tick >> 3; + const size_t byte_offset = tick >> 3; const unsigned mask = 1 << (tick & 0x7); u8bits[byte_offset] &= ~mask; } static CFISH_INLINE void -lucy_NumUtil_u1flip(void *array, uint32_t tick) { +lucy_NumUtil_u1flip(void *array, size_t tick) { uint8_t *const u8bits = (uint8_t*)array; - const uint32_t byte_offset = tick >> 3; + const size_t byte_offset = tick >> 3; const unsigned mask = 1 << (tick & 0x7); u8bits[byte_offset] ^= mask; } static CFISH_INLINE uint8_t -lucy_NumUtil_u2get(const void *array, uint32_t tick) { +lucy_NumUtil_u2get(const void *array, size_t tick) { uint8_t *ints = (uint8_t*)array; uint8_t byte = ints[(tick >> 2)]; int shift = 2 * (tick & 0x3); @@ -477,7 +477,7 @@ lucy_NumUtil_u2get(const void *array, uint32_t tick) { } static CFISH_INLINE void -lucy_NumUtil_u2set(void *array, uint32_t tick, uint8_t value) { +lucy_NumUtil_u2set(void *array, size_t tick, uint8_t value) { uint8_t *ints = (uint8_t*)array; unsigned shift = 2 * (tick & 0x3); unsigned mask = (unsigned)0x3 << shift; @@ -488,7 +488,7 @@ lucy_NumUtil_u2set(void *array, uint32_t tick, uint8_t value) { static CFISH_INLINE uint8_t -lucy_NumUtil_u4get(const void *array, uint32_t tick) { +lucy_NumUtil_u4get(const void *array, size_t tick) { uint8_t *ints = (uint8_t*)array; uint8_t byte = ints[(tick >> 1)]; int shift = 4 * (tick & 1); @@ -496,7 +496,7 @@ lucy_NumUtil_u4get(const void *array, uint32_t tick) { } static CFISH_INLINE void -lucy_NumUtil_u4set(void *array, uint32_t tick, uint8_t value) { +lucy_NumUtil_u4set(void *array, size_t tick, uint8_t value) { uint8_t *ints = (uint8_t*)array; unsigned shift = 4 * (tick & 0x1); unsigned mask = (unsigned)0xF << shift;
