diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-09-03 05:23:40 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 05:23:40 +0000 |
| commit | 75611ee033bc9f8ff8ae58ce5c35130c2fbb5fef (patch) | |
| tree | cc45e222cafb2db57832137c92064a65a747d352 /native/jni/src/utils/char_utils.cpp | |
| parent | cb1479c5ff9957ee12e93fad4331f20b7c770e1b (diff) | |
| parent | 95de7ad1a8838d2a28050db8ef952e954ab9c2cc (diff) | |
| download | latinime-75611ee033bc9f8ff8ae58ce5c35130c2fbb5fef.tar.gz latinime-75611ee033bc9f8ff8ae58ce5c35130c2fbb5fef.tar.xz latinime-75611ee033bc9f8ff8ae58ce5c35130c2fbb5fef.zip | |
am 95de7ad1: Merge "Add CharUtilsTest."
* commit '95de7ad1a8838d2a28050db8ef952e954ab9c2cc':
Add CharUtilsTest.
Diffstat (limited to 'native/jni/src/utils/char_utils.cpp')
| -rw-r--r-- | native/jni/src/utils/char_utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/src/utils/char_utils.cpp b/native/jni/src/utils/char_utils.cpp index b17e0847d..3bb9055b2 100644 --- a/native/jni/src/utils/char_utils.cpp +++ b/native/jni/src/utils/char_utils.cpp @@ -1057,11 +1057,11 @@ static int compare_pair_capital(const void *a, const void *b) { - static_cast<int>((static_cast<const struct LatinCapitalSmallPair *>(b))->capital); } -/* static */ unsigned short CharUtils::latin_tolower(const unsigned short c) { +/* static */ int CharUtils::latin_tolower(const int c) { struct LatinCapitalSmallPair *p = static_cast<struct LatinCapitalSmallPair *>(bsearch(&c, SORTED_CHAR_MAP, NELEMS(SORTED_CHAR_MAP), sizeof(SORTED_CHAR_MAP[0]), compare_pair_capital)); - return p ? p->small : c; + return p ? static_cast<int>(p->small) : c; } /* |