commit 5b0761e6a94227d6ef788f589fb6edcd44ed791f
author Jean Chalard <jchalard@google.com> Fri Apr 06 17:52:18 2012 +0900
committer Jean Chalard <jchalard@google.com> Fri Apr 06 17:52:18 2012 +0900
tree 218cbebefde633682bc1828ac1985acfefdb83c2
parent 1ec1be46b84677c7f71f6b7d5ec6d3745874cc62

Remove write-only stuff

Change-Id: I5ac8ab64c77a298502b3d063ea70db9b4da41716

native/jni/src/dictionary.cpp

diff --git a/native/jni/src/dictionary.cpp b/native/jni/src/dictionary.cpp
index 981a983..9c13aa4 100644
--- a/native/jni/src/dictionary.cpp
+++ b/native/jni/src/dictionary.cpp
@@ -29,9 +29,7 @@
         int typedLetterMultiplier, int fullWordMultiplier,
         int maxWordLength, int maxWords)
     : mDict((unsigned char*) dict), mDictSize(dictSize),
-    mMmapFd(mmapFd), mDictBufAdjust(dictBufAdjust),
-    // Checks whether it has the latest dictionary or the old dictionary
-    IS_LATEST_DICT_VERSION((((unsigned char*) dict)[0] & 0xFF) >= DICTIONARY_VERSION_MIN) {
+      mMmapFd(mmapFd), mDictBufAdjust(dictBufAdjust) {
     if (DEBUG_DICT) {
         if (MAX_WORD_LENGTH_INTERNAL < maxWordLength) {
             AKLOGI("Max word length (%d) is greater than %d",
@@ -44,9 +42,8 @@
             maxWords, SUB_QUEUE_MAX_WORDS, maxWordLength);
     const unsigned int headerSize = BinaryFormat::getHeaderSize(mDict);
     mUnigramDictionary = new UnigramDictionary(mDict + headerSize, typedLetterMultiplier,
-            fullWordMultiplier, maxWordLength, maxWords, IS_LATEST_DICT_VERSION);
-    mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength,
-            IS_LATEST_DICT_VERSION, true /* hasBigram */, this);
+            fullWordMultiplier, maxWordLength, maxWords);
+    mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength, this);
 }
 
 Dictionary::~Dictionary() {