Skip to content
Snippets Groups Projects
Commit d0c383e1 authored by Ben Cheng's avatar Ben Cheng Committed by Android Git Automerger
Browse files

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

* commit '5a4949c2':
  Force inlining Correction::isSingleQuote
parents 04915a76 5a4949c2
No related branches found
No related tags found
No related merge requests found
......@@ -38,7 +38,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
ifeq ($(TARGET_ARCH), arm)
ifneq ($(TARGET_GCC_VERSION), 4.7)
ifeq ($(TARGET_GCC_VERSION), 4.6)
LOCAL_CFLAGS += -Winline
endif # TARGET_GCC_VERSION
endif # TARGET_ARCH
......
......@@ -307,7 +307,7 @@ inline void Correction::startToTraverseAllNodes() {
mNeedsToTraverseAllNodes = true;
}
inline bool Correction::isSingleQuote(const int c) {
AK_FORCE_INLINE bool Correction::isSingleQuote(const int c) {
const int userTypedChar = mProximityInfoState.getPrimaryCodePointAt(mInputIndex);
return (c == KEYCODE_SINGLE_QUOTE && userTypedChar != KEYCODE_SINGLE_QUOTE);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment