diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-11-15 19:23:23 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-11-15 19:23:23 +0900 |
| commit | 8b977c1ef83888725b30a4476abecbc6f11f90ab (patch) | |
| tree | 7da580538463f6b7a7d2ee31cc47c9480ebb6648 /native | |
| parent | d6f3dace0897fb5df1f82180ed50663ca1166930 (diff) | |
| parent | 1ce96fecf530e37ba6c2c040629ffe0c268b676c (diff) | |
| download | latinime-8b977c1ef83888725b30a4476abecbc6f11f90ab.tar.gz latinime-8b977c1ef83888725b30a4476abecbc6f11f90ab.tar.xz latinime-8b977c1ef83888725b30a4476abecbc6f11f90ab.zip | |
Merge remote-tracking branch 'goog/master' into mergescriptpackage
Diffstat (limited to 'native')
| -rw-r--r-- | native/jni/src/defines.h | 14 | ||||
| -rw-r--r-- | native/jni/src/words_priority_queue.h | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 40bc958d1..1a321ab1e 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -19,6 +19,12 @@ #include <stdint.h> +#ifdef __GNUC__ +#define AK_FORCE_INLINE __attribute__((always_inline)) __inline__ +#else // __GNUC__ +#define AK_FORCE_INLINE inline +#endif // __GNUC__ + #if defined(FLAG_DO_PROFILE) || defined(FLAG_DBG) #include <android/log.h> #ifndef LOG_TAG @@ -60,7 +66,7 @@ static inline void dumpResult(const int *outWords, const int *frequencies, const AKLOGI("-------------------------"); } -static inline void dumpWord(const int *word, const int length) { +static AK_FORCE_INLINE void dumpWord(const int *word, const int length) { static char charBuf[50]; int i = 0; for (; i < length; ++i) { @@ -383,12 +389,6 @@ template<typename T> inline T max(T a, T b) { return a > b ? a : b; } #define NELEMS(x) (sizeof(x) / sizeof((x)[0])) -#ifdef __GNUC__ -#define AK_FORCE_INLINE __attribute__((always_inline)) __inline__ -#else // __GNUC__ -#define AK_FORCE_INLINE inline -#endif // __GNUC__ - // The ratio of neutral area radius to sweet spot radius. #define NEUTRAL_AREA_RADIUS_RATIO 1.3f diff --git a/native/jni/src/words_priority_queue.h b/native/jni/src/words_priority_queue.h index 7d0c4d17d..e613d2f8a 100644 --- a/native/jni/src/words_priority_queue.h +++ b/native/jni/src/words_priority_queue.h @@ -112,15 +112,15 @@ class WordsPriorityQueue { } } - void dumpTopWord() { + AK_FORCE_INLINE void dumpTopWord() { if (size() <= 0) { return; } DUMP_WORD(mHighestSuggestedWord->mWord, mHighestSuggestedWord->mWordLength); } - float getHighestNormalizedScore(const int *before, const int beforeLength, int **outWord, - int *outScore, int *outLength) { + AK_FORCE_INLINE float getHighestNormalizedScore(const int *before, const int beforeLength, + int **outWord, int *outScore, int *outLength) { if (!mHighestSuggestedWord) { return 0.0; } |