aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/utils/char_utils.cpp
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-09-03 05:07:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-03 05:07:04 +0000
commit95de7ad1a8838d2a28050db8ef952e954ab9c2cc (patch)
tree30de2960f2e3623138cd16992c1b106f6dc006df /native/jni/src/utils/char_utils.cpp
parentef0064acee819acd97a2b3ff39e4d4e1ae50cc99 (diff)
parent29dcf97e7472bde94d591c743c5311b641fd8238 (diff)
downloadlatinime-95de7ad1a8838d2a28050db8ef952e954ab9c2cc.tar.gz
latinime-95de7ad1a8838d2a28050db8ef952e954ab9c2cc.tar.xz
latinime-95de7ad1a8838d2a28050db8ef952e954ab9c2cc.zip
Merge "Add CharUtilsTest."
Diffstat (limited to 'native/jni/src/utils/char_utils.cpp')
-rw-r--r--native/jni/src/utils/char_utils.cpp4
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;
}
/*