diff options
| author | Ken Wakasa <kwakasa@google.com> | 2012-09-16 01:23:56 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-09-16 01:23:56 +0900 |
| commit | 764dd712032d7b8012797b1116b523bef7b907f3 (patch) | |
| tree | e6897145da33c21866b57c95444a530488ca2af1 /native | |
| parent | 03dc8fe141fa9f6fa5fe8362d9d35b3f3c954b87 (diff) | |
| download | android_packages_inputmethods_LatinIME-764dd712032d7b8012797b1116b523bef7b907f3.tar.gz android_packages_inputmethods_LatinIME-764dd712032d7b8012797b1116b523bef7b907f3.tar.bz2 android_packages_inputmethods_LatinIME-764dd712032d7b8012797b1116b523bef7b907f3.zip | |
Stop using GNU extension in-class initializer for non-integral members
Change-Id: Ibc8f1c67aba91bdfeceef763ac82d61cc8d2efe1
Diffstat (limited to 'native')
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 7 | ||||
| -rw-r--r-- | native/jni/src/proximity_info_state.h | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp index 5cb9235f1..9b189183b 100644 --- a/native/jni/src/proximity_info_state.cpp +++ b/native/jni/src/proximity_info_state.cpp @@ -25,6 +25,13 @@ #include "proximity_info_state.h" namespace latinime { + +const int ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2 = 10; +const int ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR = + 1 << NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; +const float ProximityInfoState::NOT_A_DISTANCE_FLOAT = -1.0f; +const int ProximityInfoState::NOT_A_CODE = -1; + void ProximityInfoState::initInputParams(const int pointerId, const float maxPointToKeyLength, const ProximityInfo *proximityInfo, const int32_t *const inputCodes, const int inputSize, const int *const xCoordinates, const int *const yCoordinates, const int *const times, diff --git a/native/jni/src/proximity_info_state.h b/native/jni/src/proximity_info_state.h index 453b1de4d..48862a7c7 100644 --- a/native/jni/src/proximity_info_state.h +++ b/native/jni/src/proximity_info_state.h @@ -34,11 +34,10 @@ class ProximityInfo; class ProximityInfoState { public: typedef std::bitset<MAX_KEY_COUNT_IN_A_KEYBOARD> NearKeycodesSet; - static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2 = 10; - static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR = - 1 << NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; - static const float NOT_A_DISTANCE_FLOAT = -1.0f; - static const int NOT_A_CODE = -1; + static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; + static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR; + static const float NOT_A_DISTANCE_FLOAT; + static const int NOT_A_CODE; ///////////////////////////////////////// // Defined in proximity_info_state.cpp // |