diff options
author | 2014-08-25 09:06:07 +0000 | |
---|---|---|
committer | 2014-08-25 09:06:08 +0000 | |
commit | e5e7a91b490eb1214ee19031cada5f9754b45933 (patch) | |
tree | 5a6912090ba6af03e4434588cc77dd8366cd4de4 /native/jni/src | |
parent | 7defe926ca0eed2a18665cd0e4bf2ec305a03879 (diff) | |
parent | c04ae7758358eac29899fa43cfa91bb32f9c0cf1 (diff) | |
download | latinime-e5e7a91b490eb1214ee19031cada5f9754b45933.tar.gz latinime-e5e7a91b490eb1214ee19031cada5f9754b45933.tar.xz latinime-e5e7a91b490eb1214ee19031cada5f9754b45933.zip |
Merge "Add ByteArrayUtilsTest."
Diffstat (limited to 'native/jni/src')
-rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp | 2 | ||||
-rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp index 833063c17..ecbe7922c 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.cpp @@ -31,7 +31,7 @@ uint32_t BufferWithExtendableBuffer::readUint(const int size, const int pos) con uint32_t BufferWithExtendableBuffer::readUintAndAdvancePosition(const int size, int *const pos) const { - const int value = readUint(size, *pos); + const uint32_t value = readUint(size, *pos); *pos += size; return value; } diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h b/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h index c0a9fcb1d..4b3c98988 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h +++ b/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h @@ -114,7 +114,7 @@ class ByteArrayUtils { return buffer[(*pos)++]; } - static AK_FORCE_INLINE int readUint(const uint8_t *const buffer, + static AK_FORCE_INLINE uint32_t readUint(const uint8_t *const buffer, const int size, const int pos) { // size must be in 1 to 4. ASSERT(size >= 1 && size <= 4); |