diff options
Diffstat (limited to 'native/jni/src')
4 files changed, 7 insertions, 5 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 10b930e4f..1531b6cbe 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -17,6 +17,8 @@ #ifndef LATINIME_DEFINES_H #define LATINIME_DEFINES_H +#include <cstdint> + #ifdef __GNUC__ #define AK_FORCE_INLINE __attribute__((always_inline)) __inline__ #else // __GNUC__ @@ -51,7 +53,7 @@ AK_FORCE_INLINE static int intArrayToCharArray(const int *const source, const in int si = 0; int di = 0; while (si < sourceSize && di < destLimit && 0 != source[si]) { - const int codePoint = source[si++]; + const uint32_t codePoint = static_cast<uint32_t>(source[si++]); if (codePoint < 0x7F) { // One byte dest[di++] = codePoint; } else if (codePoint < 0x7FF) { // Two bytes diff --git a/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp index 1dbec5545..6f96a5a0b 100644 --- a/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp +++ b/native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp @@ -141,7 +141,7 @@ void Ver4PatriciaTriePolicy::iterateNgramEntries(const WordIdArrayView prevWordI } const auto languageModelDictContent = mBuffers->getLanguageModelDictContent(); for (size_t i = 1; i <= prevWordIds.size(); ++i) { - for (const auto entry : languageModelDictContent->getProbabilityEntries( + for (const auto& entry : languageModelDictContent->getProbabilityEntries( prevWordIds.limit(i))) { const ProbabilityEntry &probabilityEntry = entry.getProbabilityEntry(); if (!probabilityEntry.isValid()) { @@ -516,7 +516,7 @@ const WordProperty Ver4PatriciaTriePolicy::getWordProperty( int ngramPrevWordsCodePoints[MAX_PREV_WORD_COUNT_FOR_N_GRAM][MAX_WORD_LENGTH]; int ngramPrevWordsCodePointCount[MAX_PREV_WORD_COUNT_FOR_N_GRAM]; bool ngramPrevWordIsBeginningOfSentense[MAX_PREV_WORD_COUNT_FOR_N_GRAM]; - for (const auto entry : languageModelDictContent->exportAllNgramEntriesRelatedToWord( + for (const auto& entry : languageModelDictContent->exportAllNgramEntriesRelatedToWord( mHeaderPolicy, wordId)) { const int codePointCount = getCodePointsAndReturnCodePointCount(entry.getTargetWordId(), MAX_WORD_LENGTH, ngramTargetCodePoints); diff --git a/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h index 8a614730b..a30336475 100644 --- a/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h +++ b/native/jni/src/dictionary/utils/binary_dictionary_bigrams_iterator.h @@ -35,7 +35,7 @@ class BinaryDictionaryBigramsIterator { mBigramPos(NOT_A_DICT_POS), mProbability(NOT_A_PROBABILITY), mHasNext(pos != NOT_A_DICT_POS) {} - BinaryDictionaryBigramsIterator(BinaryDictionaryBigramsIterator &&bigramsIterator) + BinaryDictionaryBigramsIterator(BinaryDictionaryBigramsIterator &&bigramsIterator) noexcept : mBigramsStructurePolicy(bigramsIterator.mBigramsStructurePolicy), mPos(bigramsIterator.mPos), mBigramPos(bigramsIterator.mBigramPos), mProbability(bigramsIterator.mProbability), mHasNext(bigramsIterator.mHasNext) {} diff --git a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h index a4ddd58c2..e14805e37 100644 --- a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h +++ b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h @@ -31,7 +31,7 @@ class BinaryDictionaryShortcutIterator { mPos(shortcutStructurePolicy->getStartPos(shortcutPos)), mHasNextShortcutTarget(shortcutPos != NOT_A_DICT_POS) {} - BinaryDictionaryShortcutIterator(const BinaryDictionaryShortcutIterator &&shortcutIterator) + BinaryDictionaryShortcutIterator(const BinaryDictionaryShortcutIterator &&shortcutIterator) noexcept : mShortcutStructurePolicy(shortcutIterator.mShortcutStructurePolicy), mPos(shortcutIterator.mPos), mHasNextShortcutTarget(shortcutIterator.mHasNextShortcutTarget) {} |