diff options
author | 2012-08-13 12:07:35 -0400 | |
---|---|---|
committer | 2012-08-23 15:26:32 -0400 | |
commit | dd70f8e8b18c2a56604ef114d4847d3366530ce6 (patch) | |
tree | 240f0f06cc75e847601d2ffdfa0302f93283808f | |
parent | 38be4ee0fae07ed4abf6aab573fdc9b5955e7895 (diff) | |
download | latinime-dd70f8e8b18c2a56604ef114d4847d3366530ce6.tar.gz latinime-dd70f8e8b18c2a56604ef114d4847d3366530ce6.tar.xz latinime-dd70f8e8b18c2a56604ef114d4847d3366530ce6.zip |
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>
-rw-r--r-- | native/jni/src/proximity_info.cpp | 2 | ||||
-rw-r--r-- | native/jni/src/proximity_info.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp index 960d40119..6b83600a0 100644 --- a/native/jni/src/proximity_info.cpp +++ b/native/jni/src/proximity_info.cpp @@ -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, diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h index feb0c9444..d4d8f4494 100644 --- a/native/jni/src/proximity_info.h +++ b/native/jni/src/proximity_info.h @@ -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; |