diff options
| author |   Ben Cheng <bccheng@google.com> | 2013-04-03 16:59:29 -0700 |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2013-04-04 11:26:04 -0700 |
| commit | c2fbd7c64d97743723d4d4da3f8dacf797ad0339 (patch) | |
| tree | 8c18004360932af23acde5336008eefe4ac22ad4 | |
| parent | 4cdb7ccb325db33fa812855b6ea6de2533cdb6be (diff) | |
| download | latinime-c2fbd7c64d97743723d4d4da3f8dacf797ad0339.tar.gz latinime-c2fbd7c64d97743723d4d4da3f8dacf797ad0339.tar.xz latinime-c2fbd7c64d97743723d4d4da3f8dacf797ad0339.zip | |
Force inlining Correction::isSingleQuote
Also, only apply -Winline with GCC 4.6. There are some copy constructors
that GCC 4.7/4.8 fail to inline.
Change-Id: I97906045224e89377e8ea6add07a79fa088648af
| -rw-r--r-- | native/jni/Android.mk | 2 | ||||
| -rw-r--r-- | native/jni/src/correction.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 3735ec07b..7f80dc5d7 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -32,7 +32,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 diff --git a/native/jni/src/correction.h b/native/jni/src/correction.h index f0d62102f..a9e9b48a6 100644 --- a/native/jni/src/correction.h +++ b/native/jni/src/correction.h @@ -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); } |