aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-03-07 00:32:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 00:32:42 -0800
commit1e7ab379d864275741ebaaa87a2231d7a5562317 (patch)
treedbf5831a4b4a8bf6770843f886b40e624e611e80
parent0751495921acc3736868d41fd4522789f37c64fc (diff)
parent6767f88e3c7814ab9aecd256e24b939f9b80234a (diff)
downloadlatinime-1e7ab379d864275741ebaaa87a2231d7a5562317.tar.gz
latinime-1e7ab379d864275741ebaaa87a2231d7a5562317.tar.xz
latinime-1e7ab379d864275741ebaaa87a2231d7a5562317.zip
am 6767f88e: Address warnings pointed out by clang
* commit '6767f88e3c7814ab9aecd256e24b939f9b80234a': Address warnings pointed out by clang
-rw-r--r--native/jni/src/suggest/core/layout/proximity_info_utils.h3
-rw-r--r--native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h4
2 files changed, 2 insertions, 5 deletions
diff --git a/native/jni/src/suggest/core/layout/proximity_info_utils.h b/native/jni/src/suggest/core/layout/proximity_info_utils.h
index f55ee23aa..310bbdb62 100644
--- a/native/jni/src/suggest/core/layout/proximity_info_utils.h
+++ b/native/jni/src/suggest/core/layout/proximity_info_utils.h
@@ -129,7 +129,7 @@ class ProximityInfoUtils {
struct NormalDistribution {
public:
NormalDistribution(const float u, const float sigma)
- : mU(u), mSigma(sigma),
+ : mU(u),
mPreComputedNonExpPart(1.0f / sqrtf(2.0f * M_PI_F
* GeometryUtils::SQUARE_FLOAT(sigma))),
mPreComputedExponentPart(-1.0f / (2.0f * GeometryUtils::SQUARE_FLOAT(sigma))) {}
@@ -143,7 +143,6 @@ class ProximityInfoUtils {
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(NormalDistribution);
const float mU; // mean value
- const float mSigma; // standard deviation
const float mPreComputedNonExpPart; // = 1 / sqrt(2 * PI * sigma^2)
const float mPreComputedExponentPart; // = -1 / (2 * sigma^2)
}; // struct NormalDistribution
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h
index ae863af57..f2fa5b75b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h
@@ -31,8 +31,7 @@ class Ver4ShortcutListPolicy : public DictionaryShortcutsStructurePolicy {
public:
Ver4ShortcutListPolicy(ShortcutDictContent *const shortcutDictContent,
const TerminalPositionLookupTable *const terminalPositionLookupTable)
- : mShortcutDictContent(shortcutDictContent),
- mTerminalPositionLookupTable(terminalPositionLookupTable) {}
+ : mShortcutDictContent(shortcutDictContent) {}
~Ver4ShortcutListPolicy() {}
@@ -104,7 +103,6 @@ class Ver4ShortcutListPolicy : public DictionaryShortcutsStructurePolicy {
DISALLOW_IMPLICIT_CONSTRUCTORS(Ver4ShortcutListPolicy);
ShortcutDictContent *const mShortcutDictContent;
- const TerminalPositionLookupTable *const mTerminalPositionLookupTable;
};
} // namespace latinime
#endif // LATINIME_VER4_SHORTCUT_LIST_POLICY_H