Fixed inline initialization of non-integral static const member

Such initializations are a GNU extension not supported by clang.

Change-Id: I543c35cacdda080d2599cb99587661b2e9cd404f
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
This commit is contained in:
Ariel Bernal 2012-08-13 12:07:35 -04:00 committed by Edwin Vane
parent 38be4ee0fa
commit dd70f8e8b1
2 changed files with 3 additions and 1 deletions

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,

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;