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

* commit 'dbe3ac45009366e7745492b135a5ce6967786fc4':
  Fixed inline initialization of non-integral static const member

2 files changed, 3 insertions, 1 deletions

diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 855619dd7..80e14fbb1 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 80d43af9d..3a2511cf1 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;