From 764dd712032d7b8012797b1116b523bef7b907f3 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Sun, 16 Sep 2012 01:23:56 +0900 Subject: [PATCH] Stop using GNU extension in-class initializer for non-integral members Change-Id: Ibc8f1c67aba91bdfeceef763ac82d61cc8d2efe1 --- native/jni/src/proximity_info_state.cpp | 7 +++++++ native/jni/src/proximity_info_state.h | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp index 5cb9235f1..9b189183b 100644 --- a/native/jni/src/proximity_info_state.cpp +++ b/native/jni/src/proximity_info_state.cpp @@ -25,6 +25,13 @@ #include "proximity_info_state.h" namespace latinime { + +const int ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2 = 10; +const int ProximityInfoState::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR = + 1 << NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; +const float ProximityInfoState::NOT_A_DISTANCE_FLOAT = -1.0f; +const int ProximityInfoState::NOT_A_CODE = -1; + void ProximityInfoState::initInputParams(const int pointerId, const float maxPointToKeyLength, const ProximityInfo *proximityInfo, const int32_t *const inputCodes, const int inputSize, const int *const xCoordinates, const int *const yCoordinates, const int *const times, diff --git a/native/jni/src/proximity_info_state.h b/native/jni/src/proximity_info_state.h index 453b1de4d..48862a7c7 100644 --- a/native/jni/src/proximity_info_state.h +++ b/native/jni/src/proximity_info_state.h @@ -34,11 +34,10 @@ class ProximityInfo; class ProximityInfoState { public: typedef std::bitset NearKeycodesSet; - static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2 = 10; - static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR = - 1 << NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; - static const float NOT_A_DISTANCE_FLOAT = -1.0f; - static const int NOT_A_CODE = -1; + static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR_LOG_2; + static const int NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR; + static const float NOT_A_DISTANCE_FLOAT; + static const int NOT_A_CODE; ///////////////////////////////////////// // Defined in proximity_info_state.cpp //