nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
main
Ken Wakasa 2012-09-17 12:46:43 -07:00 committed by Android Git Automerger
parent 184fc5f15e b05464907a
commit 76a4a0bc48
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
native/jni/src/proximity_info_state.cpp
View File

@ -25,6 +25,13 @@
#include "proximity_info_state.h" #include "proximity_info_state.h"
namespace latinime { 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, void ProximityInfoState::initInputParams(const int pointerId, const float maxPointToKeyLength,
const ProximityInfo *proximityInfo, const int32_t *const inputCodes, const int inputSize, const ProximityInfo *proximityInfo, const int32_t *const inputCodes, const int inputSize,
const int *const xCoordinates, const int *const yCoordinates, const int *const times, const int *const xCoordinates, const int *const yCoordinates, const int *const times,

9
native/jni/src/proximity_info_state.h
View File

@ -34,11 +34,10 @@ class ProximityInfo;
class ProximityInfoState { class ProximityInfoState {
public: public:
typedef std::bitset<MAX_KEY_COUNT_IN_A_KEYBOARD> NearKeycodesSet; 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_LOG_2;
static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR = static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR;
1 << NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; static const float NOT_A_DISTANCE_FLOAT;
static const float NOT_A_DISTANCE_FLOAT = -1.0f; static const int NOT_A_CODE;
static const int NOT_A_CODE = -1;
///////////////////////////////////////// /////////////////////////////////////////
// Defined in proximity_info_state.cpp // // Defined in proximity_info_state.cpp //