commit 65534ffc4a539e09d35ed7a1be1e87186009dd19
author Ben Cheng <bccheng@google.com> Thu Apr 04 12:20:25 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 04 12:20:25 2013 -0700
tree 838b9eb7180ad61354a090f757de340c8cd36938
parent f3633e9b8eb0ccfec3a641449d86a1bc2f712352
parent d0c383e1473c1b302038f4145ba5192fd9af9a5f

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

* commit 'd0c383e1473c1b302038f4145ba5192fd9af9a5f':
  Force inlining Correction::isSingleQuote

native/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index b476fc3..4df2585 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -37,7 +37,7 @@
     -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

diff --git a/native/jni/src/correction.h b/native/jni/src/correction.h
index f0d6210..a9e9b48 100644
--- a/native/jni/src/correction.h
+++ b/native/jni/src/correction.h
@@ -307,7 +307,7 @@
     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);
 }