diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-09-17 12:46:43 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-09-17 12:46:43 -0700 |
| commit | 76a4a0bc48cdad1e0e14e599474891206fa1a8c2 (patch) | |
| tree | e6897145da33c21866b57c95444a530488ca2af1 | |
| parent | 184fc5f15ef0d9ca28f80f69f8948eb69092855d (diff) | |
| parent | b05464907a91c8ec1f917be47a31cd05101aef3e (diff) | |
| download | latinime-76a4a0bc48cdad1e0e14e599474891206fa1a8c2.tar.gz latinime-76a4a0bc48cdad1e0e14e599474891206fa1a8c2.tar.xz latinime-76a4a0bc48cdad1e0e14e599474891206fa1a8c2.zip | |
am b0546490: am 764dd712: Stop using GNU extension in-class initializer for non-integral members
* commit 'b05464907a91c8ec1f917be47a31cd05101aef3e':
Stop using GNU extension in-class initializer for non-integral members
| -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 // |