diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-07-05 16:53:56 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-07-05 16:53:56 +0900 |
| commit | 3d2f5f848764252ecd2f15c2d0d857c1fe7f7eaf (patch) | |
| tree | 9d3db512a4541c8728545aa474647216d44765cb /native/jni/src/char_utils.h | |
| parent | 1930f194c2f3b3a6182906c4378388025dff5686 (diff) | |
| parent | 0726f466f7789ca112697adf6505870bb821ea17 (diff) | |
| download | latinime-3d2f5f848764252ecd2f15c2d0d857c1fe7f7eaf.tar.gz latinime-3d2f5f848764252ecd2f15c2d0d857c1fe7f7eaf.tar.xz latinime-3d2f5f848764252ecd2f15c2d0d857c1fe7f7eaf.zip | |
Merge remote-tracking branch 'goog/master' into mergescript
Conflicts:
java/src/com/android/inputmethod/keyboard/Keyboard.java
java/src/com/android/inputmethod/latin/LatinIME.java
java/src/com/android/inputmethod/latin/Suggest.java
Change-Id: I73c1cec1f4bca5139372392e93d55081d814fa6c
Diffstat (limited to 'native/jni/src/char_utils.h')
| -rw-r--r-- | native/jni/src/char_utils.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/native/jni/src/char_utils.h b/native/jni/src/char_utils.h index 607dc5195..21dca9a0a 100644 --- a/native/jni/src/char_utils.h +++ b/native/jni/src/char_utils.h @@ -50,8 +50,7 @@ inline static unsigned short toBaseChar(unsigned short c) { return c; } -inline static unsigned short toBaseLowerCase(unsigned short c) { - c = toBaseChar(c); +inline static unsigned short toLowerCase(const unsigned short c) { if (isAsciiUpper(c)) { return toAsciiLower(c); } else if (isAscii(c)) { @@ -60,6 +59,10 @@ inline static unsigned short toBaseLowerCase(unsigned short c) { return latin_tolower(c); } +inline static unsigned short toBaseLowerCase(const unsigned short c) { + return toLowerCase(toBaseChar(c)); +} + } // namespace latinime #endif // LATINIME_CHAR_UTILS_H |