commit dbe3ac45009366e7745492b135a5ce6967786fc4
author Jean-Baptiste Queru <jbq@google.com> Fri Aug 24 12:44:32 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Fri Aug 24 12:44:32 2012 -0700
tree cd20ad3ffea0c90393cd416a86395791a0fe99ba
parent d78b9f7d81a3730671b91f247e1be3bb1f2ba202
parent dd70f8e8b18c2a56604ef114d4847d3366530ce6

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

native/jni/src/proximity_info.cpp

diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 855619d..80e14fb 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -35,6 +35,8 @@
     }
 }
 
+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,

native/jni/src/proximity_info.h

diff --git a/native/jni/src/proximity_info.h b/native/jni/src/proximity_info.h
index 80d43af..3a2511c 100644
--- a/native/jni/src/proximity_info.h
+++ b/native/jni/src/proximity_info.h
@@ -77,7 +77,7 @@
     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;