From 0c549e742426431ba9fdcca57d0724224bf13ae2 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 22 Jul 2020 20:56:25 -0700 Subject: Update language to comply with Android’s inclusive language guidance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://source.android.com/setup/contribute/respectful-code for reference Bug: 161896447 Test: tapas LatinIME && m Change-Id: Ic06f948c023a091e1532db826a78dd01031d7205 --- .../structure/backward/v402/content/probability_dict_content.cpp | 8 +++++--- .../src/dictionary/utils/binary_dictionary_shortcut_iterator.h | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'native') diff --git a/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp index 587a1c097..8485377ee 100644 --- a/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp +++ b/native/jni/src/dictionary/structure/backward/v402/content/probability_dict_content.cpp @@ -65,13 +65,15 @@ bool ProbabilityDictContent::setProbabilityEntry(const int terminalId, } const int entryPos = getEntryPos(terminalId); if (terminalId >= mSize) { - ProbabilityEntry dummyEntry; + ProbabilityEntry placeholderEntry; // Write new entry. int writingPos = getBuffer()->getTailPosition(); while (writingPos <= entryPos) { // Fulfilling with placeholder entries until writingPos. - if (!writeEntry(&dummyEntry, writingPos)) { - AKLOGE("Cannot write dummy entry. pos: %d, mSize: %d", writingPos, mSize); + if (!writeEntry(&placeholderEntry, writingPos)) { + AKLOGE("Cannot write placeholder entry. pos: %d, mSize: %d", + writingPos, + mSize); return false; } writingPos += getEntrySize(); 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 3638f3866..45c9cd36d 100644 --- a/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h +++ b/native/jni/src/dictionary/utils/binary_dictionary_shortcut_iterator.h @@ -41,12 +41,12 @@ class BinaryDictionaryShortcutIterator { } // Gets the shortcut target itself as an int string and put it to outTarget, put its length - // to outTargetLength, put whether it is allowlist to outIsWhitelist. + // to outTargetLength, put whether it is allowlist to outIsAllowed. AK_FORCE_INLINE void nextShortcutTarget( const int maxDepth, int *const outTarget, int *const outTargetLength, - bool *const outIsWhitelist) { + bool *const outIsAllowed) { mShortcutStructurePolicy->getNextShortcut(maxDepth, outTarget, outTargetLength, - outIsWhitelist, &mHasNextShortcutTarget, &mPos); + outIsAllowed, &mHasNextShortcutTarget, &mPos); } private: -- cgit v1.2.3-83-g751a