nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 65534ffc: am d0c383e1: am 5a4949c2: Merge "Force inlining Correction::isSingleQuote" into jb-mr2-dev 

* commit '65534ffc4a539e09d35ed7a1be1e87186009dd19':
  Force inlining Correction::isSingleQuote
main
Ben Cheng 2013-04-04 12:23:36 -07:00 committed by Android Git Automerger
parent 481412bb44 65534ffc4a
commit 96cb244d7b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/Android.mk
View File

@ -37,7 +37,7 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali
-Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers
ifeq ($(TARGET_ARCH), arm) ifeq ($(TARGET_ARCH), arm)
ifneq ($(TARGET_GCC_VERSION), 4.7) ifeq ($(TARGET_GCC_VERSION), 4.6)
LOCAL_CFLAGS += -Winline LOCAL_CFLAGS += -Winline
endif # TARGET_GCC_VERSION endif # TARGET_GCC_VERSION
endif # TARGET_ARCH endif # TARGET_ARCH

2
native/jni/src/correction.h
View File

@ -307,7 +307,7 @@ inline void Correction::startToTraverseAllNodes() {
mNeedsToTraverseAllNodes = true; mNeedsToTraverseAllNodes = true;
} }
inline bool Correction::isSingleQuote(const int c) { AK_FORCE_INLINE bool Correction::isSingleQuote(const int c) {
const int userTypedChar = mProximityInfoState.getPrimaryCodePointAt(mInputIndex); const int userTypedChar = mProximityInfoState.getPrimaryCodePointAt(mInputIndex);
return (c == KEYCODE_SINGLE_QUOTE && userTypedChar != KEYCODE_SINGLE_QUOTE); return (c == KEYCODE_SINGLE_QUOTE && userTypedChar != KEYCODE_SINGLE_QUOTE);
} }