commit 0cb2097a45a41875ec2265da316eb770565b6706
author satok <satok@google.com> Tue Mar 13 22:07:56 2012 +0900
committer satok <satok@google.com> Wed Mar 14 11:17:59 2012 +0900
tree e7c9e54c1daa7a3cec07362c803300f4fb0fb53e
parent 7ef1dabd92a9dae042965cd10d08a2cd47455dcc

Fix additional proximity in the native code

Bug: 4343280
Change-Id: I4164bb916b2dbdfb6bdc151b99d46a6171d9c355

native/src/additional_proximity_chars.h

diff --git a/native/src/additional_proximity_chars.h b/native/src/additional_proximity_chars.h
index e0049d9..e0ecc0e 100644
--- a/native/src/additional_proximity_chars.h
+++ b/native/src/additional_proximity_chars.h
@@ -20,29 +20,31 @@
 #include <stdint.h>
 #include <string>
 
+#include "defines.h"
+
 namespace latinime {
 
 class AdditionalProximityChars {
  private:
     static const std::string LOCALE_EN_US;
     static const int EN_US_ADDITIONAL_A_SIZE = 4;
-    static const uint32_t EN_US_ADDITIONAL_A[];
+    static const int32_t EN_US_ADDITIONAL_A[];
     static const int EN_US_ADDITIONAL_E_SIZE = 4;
-    static const uint32_t EN_US_ADDITIONAL_E[];
+    static const int32_t EN_US_ADDITIONAL_E[];
     static const int EN_US_ADDITIONAL_I_SIZE = 4;
-    static const uint32_t EN_US_ADDITIONAL_I[];
+    static const int32_t EN_US_ADDITIONAL_I[];
     static const int EN_US_ADDITIONAL_O_SIZE = 4;
-    static const uint32_t EN_US_ADDITIONAL_O[];
+    static const int32_t EN_US_ADDITIONAL_O[];
     static const int EN_US_ADDITIONAL_U_SIZE = 4;
-    static const uint32_t EN_US_ADDITIONAL_U[];
+    static const int32_t EN_US_ADDITIONAL_U[];
 
-    static bool isEnLocale(const std::string* locale_str) {
+    static bool isEnLocale(const std::string *locale_str) {
         return locale_str && locale_str->size() >= LOCALE_EN_US.size()
-                && locale_str->compare(0, LOCALE_EN_US.size(), LOCALE_EN_US);
+                && LOCALE_EN_US.compare(0, LOCALE_EN_US.size(), *locale_str);
     }
 
  public:
-    static int getAdditionalCharsSize(const std::string* locale_str, const uint16_t c) {
+    static int getAdditionalCharsSize(const std::string* locale_str, const int32_t c) {
         if (!isEnLocale(locale_str)) {
             return 0;
         }
@@ -62,7 +64,7 @@
         }
     }
 
-    static const uint32_t* getAdditionalChars(const std::string* locale_str, const uint32_t c) {
+    static const int32_t* getAdditionalChars(const std::string *locale_str, const int32_t c) {
         if (!isEnLocale(locale_str)) {
             return 0;
         }
@@ -82,7 +84,7 @@
         }
     }
 
-    static bool hasAdditionalChars(const std::string* locale_str, const uint32_t c) {
+    static bool hasAdditionalChars(const std::string *locale_str, const int32_t c) {
         return getAdditionalCharsSize(locale_str, c) > 0;
     }
 };