From d74214d7266bdd53fc69971fd82b59a7a92d8c63 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Wed, 13 Feb 2013 19:56:19 +0900 Subject: [PATCH] Prep for GCC 4.6 that will be used in unbundled branches Change-Id: I31c1d1bc573ee10779efce0f221d378ad758e9ca --- native/jni/src/proximity_info.h | 7 ++++--- native/jni/src/proximity_info_utils.h | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h index ee79367ef..22bbdf165 100644 --- a/native/jni/src/proximity_info.h +++ b/native/jni/src/proximity_info.h @@ -70,15 +70,16 @@ class ProximityInfo { int getKeyCenterYOfKeyIdG(int keyId) const; int getKeyKeyDistanceG(int keyId0, int keyId1) const; - void initializeProximities(const int *const inputCodes, const int *const inputXCoordinates, - const int *const inputYCoordinates, const int inputSize, int *allInputCodes) const { + void AK_FORCE_INLINE initializeProximities(const int *const inputCodes, + const int *const inputXCoordinates, const int *const inputYCoordinates, + const int inputSize, int *allInputCodes) const { ProximityInfoUtils::initializeProximities(inputCodes, inputXCoordinates, inputYCoordinates, inputSize, mKeyXCoordinates, mKeyYCoordinates, mKeyWidths, mKeyHeights, mProximityCharsArray, CELL_HEIGHT, CELL_WIDTH, GRID_WIDTH, MOST_COMMON_KEY_WIDTH, KEY_COUNT, mLocaleStr, &mCodeToKeyMap, allInputCodes); } - int getKeyIndexOf(const int c) const { + int AK_FORCE_INLINE getKeyIndexOf(const int c) const { return ProximityInfoUtils::getKeyIndexOf(KEY_COUNT, c, &mCodeToKeyMap); } diff --git a/native/jni/src/proximity_info_utils.h b/native/jni/src/proximity_info_utils.h index c50df57f9..51cafba2c 100644 --- a/native/jni/src/proximity_info_utils.h +++ b/native/jni/src/proximity_info_utils.h @@ -28,7 +28,7 @@ namespace latinime { class ProximityInfoUtils { public: - static int getKeyIndexOf(const int keyCount, const int c, + static AK_FORCE_INLINE int getKeyIndexOf(const int keyCount, const int c, const hash_map_compat *const codeToKeyMap) { if (keyCount == 0) { // We do not have the coordinate data @@ -45,7 +45,7 @@ class ProximityInfoUtils { return NOT_AN_INDEX; } - static void initializeProximities(const int *const inputCodes, + static AK_FORCE_INLINE void initializeProximities(const int *const inputCodes, const int *const inputXCoordinates, const int *const inputYCoordinates, const int inputSize, const int *const keyXCoordinates, const int *const keyYCoordinates, const int *const keyWidths, const int *keyHeights, @@ -151,7 +151,7 @@ class ProximityInfoUtils { return left < right && top < bottom && x >= left && x < right && y >= top && y < bottom; } - static void calculateProximities(const int *const keyXCoordinates, + static AK_FORCE_INLINE void calculateProximities(const int *const keyXCoordinates, const int *const keyYCoordinates, const int *const keyWidths, const int *keyHeights, const int *const proximityCharsArray, const int cellHeight, const int cellWidth, const int gridWidth, const int mostCommonKeyWidth, const int keyCount,