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

am dbe3ac45: Merge "Fixed inline initialization of non-integral static const member"

Browse source 
* commit 'dbe3ac45009366e7745492b135a5ce6967786fc4':
  Fixed inline initialization of non-integral static const member
This commit is contained in:
Jean-Baptiste Queru 2012-08-24 12:50:01 -07:00 committed by Android Git Automerger
commit 5f67769903
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
native/jni/src/proximity_info.cpp
View file

@ -35,6 +35,8 @@ inline void copyOrFillZero(void *to, const void *from, size_t size) {
}
}
const float ProximityInfo::NOT_A_DISTANCE_FLOAT = -1.0f;
ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximityCharsSize,
const int keyboardWidth, const int keyboardHeight, const int gridWidth,
const int gridHeight, const int mostCommonKeyWidth,

2
native/jni/src/proximity_info.h
View file

@ -77,7 +77,7 @@ class ProximityInfo {
static const int MAX_KEY_COUNT_IN_A_KEYBOARD = 64;
// The upper limit of the char code in mCodeToKeyIndex
static const int MAX_CHAR_CODE = 127;
static const float NOT_A_DISTANCE_FLOAT = -1.0f;
static const float NOT_A_DISTANCE_FLOAT;
static const int NOT_A_CODE = -1;
int getStartIndexFromCoordinates(const int x, const int y) const;