aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroynagi <ksk@google.com>2013-08-01 03:40:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-01 03:40:47 +0000
commit932aeb9d22a9e612dbeff7e45629bcdd6b99486c (patch)
treef0153784be41a284a4ad779ee6d521c9da3c2c08
parent552a4b84f87452f2df6a3b85bcb6ef33547f70ca (diff)
parent2401f7c62d9109e3b34fde20463ffe225d64d61a (diff)
downloadlatinime-932aeb9d22a9e612dbeff7e45629bcdd6b99486c.tar.gz
latinime-932aeb9d22a9e612dbeff7e45629bcdd6b99486c.tar.xz
latinime-932aeb9d22a9e612dbeff7e45629bcdd6b99486c.zip
Merge "Move binary_format.h to policyimpl."
-rw-r--r--native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp1
-rw-r--r--native/jni/src/suggest/core/dictionary/dictionary.cpp1
-rw-r--r--native/jni/src/suggest/policyimpl/dictionary/binary_format.h (renamed from native/jni/src/suggest/core/dictionary/binary_format.h)0
-rw-r--r--native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.cpp2
4 files changed, 1 insertions, 3 deletions
diff --git a/native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp b/native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp
index 09eecd348..532c769c6 100644
--- a/native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/bigram_dictionary.cpp
@@ -23,7 +23,6 @@
#include "defines.h"
#include "suggest/core/dictionary/binary_dictionary_bigrams_iterator.h"
#include "suggest/core/dictionary/binary_dictionary_info.h"
-#include "suggest/core/dictionary/binary_format.h"
#include "suggest/core/dictionary/dictionary.h"
#include "suggest/core/dictionary/probability_utils.h"
#include "utils/char_utils.h"
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp
index 52e635975..4f5d29f6a 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp
@@ -24,7 +24,6 @@
#include "defines.h"
#include "jni.h"
#include "suggest/core/dictionary/bigram_dictionary.h"
-#include "suggest/core/dictionary/binary_format.h"
#include "suggest/core/session/dic_traverse_session.h"
#include "suggest/core/suggest.h"
#include "suggest/core/suggest_options.h"
diff --git a/native/jni/src/suggest/core/dictionary/binary_format.h b/native/jni/src/suggest/policyimpl/dictionary/binary_format.h
index 9e22b50cd..9e22b50cd 100644
--- a/native/jni/src/suggest/core/dictionary/binary_format.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/binary_format.h
diff --git a/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.cpp b/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.cpp
index 450f6d2ec..2a9a5ce7a 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/patricia_trie_policy.cpp
@@ -21,7 +21,7 @@
#include "suggest/core/dicnode/dic_node.h"
#include "suggest/core/dicnode/dic_node_vector.h"
#include "suggest/core/dictionary/binary_dictionary_info.h"
-#include "suggest/core/dictionary/binary_format.h"
+#include "suggest/policyimpl/dictionary/binary_format.h"
namespace latinime {