Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f677699 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

* commit 'dbe3ac45':
  Fixed inline initialization of non-integral static const member
parents 96061a70 dbe3ac45

native/jni/src/proximity_info.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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,

native/jni/src/proximity_info.h

+1 −1
Original line number Diff line number Diff line
@@ -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;