Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65534ffc authored by Ben Cheng's avatar Ben Cheng Committed by Android Git Automerger
Browse files

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

* commit 'd0c383e1':
  Force inlining Correction::isSingleQuote
parents f3633e9b d0c383e1

native/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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



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

native/jni/src/correction.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}