commit 267030dd82a6165ca56899d2988b5dc51ebea104
author Ken Wakasa <kwakasa@google.com> Tue Aug 14 18:54:13 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Tue Aug 14 19:03:09 2012 +0900
tree 030e1bc08837d81619d7d3f7463a55d5cdd1a772
parent 54035065c0ba516af408b1a3e12e12b1483ed61a

Cleanup casts.

Change-Id: I3bf33ca407cc3bee9f5c4c6f929cdb1421b92c50

native/jni/src/char_utils.cpp

diff --git a/native/jni/src/char_utils.cpp b/native/jni/src/char_utils.cpp
index fc0a059..223291f 100644
--- a/native/jni/src/char_utils.cpp
+++ b/native/jni/src/char_utils.cpp
@@ -885,14 +885,13 @@
 };
 
 static int compare_pair_capital(const void *a, const void *b) {
-    return static_cast<int>(*reinterpret_cast<const unsigned short *>(a))
-            - static_cast<int>(
-                    (reinterpret_cast<const struct LatinCapitalSmallPair *>(b))->capital);
+    return static_cast<int>(*static_cast<const unsigned short *>(a))
+            - static_cast<int>((static_cast<const struct LatinCapitalSmallPair *>(b))->capital);
 }
 
 unsigned short latin_tolower(unsigned short c) {
     struct LatinCapitalSmallPair *p =
-            reinterpret_cast<struct LatinCapitalSmallPair *>(bsearch(&c, SORTED_CHAR_MAP,
+            static_cast<struct LatinCapitalSmallPair *>(bsearch(&c, SORTED_CHAR_MAP,
                     sizeof(SORTED_CHAR_MAP) / sizeof(SORTED_CHAR_MAP[0]),
                     sizeof(SORTED_CHAR_MAP[0]),
                     compare_pair_capital));