diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-08-12 19:07:44 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-12 19:07:44 -0700 |
| commit | 7b4531a16f0d7f237822e94f3e962257ee9d0c16 (patch) | |
| tree | 2237aa0f754e3ab44ccfac034f5ef6e17ffda724 /native/jni/src/char_utils.cpp | |
| parent | f9b2841fb592778ad34b5181e1c0bcbf551e3632 (diff) | |
| parent | bcec82de66f52655593dc233346f11468f5077a0 (diff) | |
| download | latinime-7b4531a16f0d7f237822e94f3e962257ee9d0c16.tar.gz latinime-7b4531a16f0d7f237822e94f3e962257ee9d0c16.tar.xz latinime-7b4531a16f0d7f237822e94f3e962257ee9d0c16.zip | |
am bcec82de: Clean up constructors
* commit 'bcec82de66f52655593dc233346f11468f5077a0':
Clean up constructors
Diffstat (limited to 'native/jni/src/char_utils.cpp')
| -rw-r--r-- | native/jni/src/char_utils.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/native/jni/src/char_utils.cpp b/native/jni/src/char_utils.cpp index 45d49b087..fc0a0596f 100644 --- a/native/jni/src/char_utils.cpp +++ b/native/jni/src/char_utils.cpp @@ -885,16 +885,17 @@ static const struct LatinCapitalSmallPair SORTED_CHAR_MAP[] = { }; static int compare_pair_capital(const void *a, const void *b) { - return (int)(*(unsigned short *)a) - - (int)((struct LatinCapitalSmallPair*)b)->capital; + return static_cast<int>(*reinterpret_cast<const unsigned short *>(a)) + - static_cast<int>( + (reinterpret_cast<const struct LatinCapitalSmallPair *>(b))->capital); } unsigned short latin_tolower(unsigned short c) { struct LatinCapitalSmallPair *p = - (struct LatinCapitalSmallPair *)bsearch(&c, SORTED_CHAR_MAP, + reinterpret_cast<struct LatinCapitalSmallPair *>(bsearch(&c, SORTED_CHAR_MAP, sizeof(SORTED_CHAR_MAP) / sizeof(SORTED_CHAR_MAP[0]), sizeof(SORTED_CHAR_MAP[0]), - compare_pair_capital); + compare_pair_capital)); return p ? p->small : c; } } // namespace latinime |