commit 1ce96fecf530e37ba6c2c040629ffe0c268b676c
author Ken Wakasa <kwakasa@google.com> Thu Nov 15 19:09:11 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Thu Nov 15 19:14:36 2012 +0900
tree 6014d38cb8de01310dd51b4f1e14e8ccf2adf68b
parent 0dfb89b41ef876e163afd37b854b37386502d49e

Fix debug build error

Change-Id: Id18d72093a36d41859744f98238b3b761ddb667e

native/jni/src/defines.h

diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h
index 40bc958..1a321ab 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 @@
     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 @@
 
 #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
 

native/jni/src/words_priority_queue.h

diff --git a/native/jni/src/words_priority_queue.h b/native/jni/src/words_priority_queue.h
index 7d0c4d1..e613d2f 100644
--- a/native/jni/src/words_priority_queue.h
+++ b/native/jni/src/words_priority_queue.h
@@ -112,15 +112,15 @@
         }
     }
 
-    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;
         }