diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-03-05 23:34:17 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 23:34:17 -0800 |
| commit | f0922a919434fa4f76a79b9922319ebadfe963d9 (patch) | |
| tree | 343864cad7161e84097d00dc44224686b5a260d7 | |
| parent | 2cb31a0f23863e59ebffbe590712016fd6f88ec9 (diff) | |
| parent | 2c7e97dcdd2201a26b16b81f9d7fe6fcf8d49262 (diff) | |
| download | latinime-f0922a919434fa4f76a79b9922319ebadfe963d9.tar.gz latinime-f0922a919434fa4f76a79b9922319ebadfe963d9.tar.xz latinime-f0922a919434fa4f76a79b9922319ebadfe963d9.zip | |
am 2c7e97dc: Merge "Create suggest/core/result directory."
* commit '2c7e97dcdd2201a26b16b81f9d7fe6fcf8d49262':
Create suggest/core/result directory.
| -rw-r--r-- | native/jni/NativeFileList.mk | 2 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/result/suggestions_output_utils.cpp (renamed from native/jni/src/suggest/core/dictionary/suggestions_output_utils.cpp) | 2 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/result/suggestions_output_utils.h (renamed from native/jni/src/suggest/core/dictionary/suggestions_output_utils.h) | 0 | ||||
| -rw-r--r-- | native/jni/src/suggest/core/suggest.cpp | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/NativeFileList.mk b/native/jni/NativeFileList.mk index 82237dc24..1f5824608 100644 --- a/native/jni/NativeFileList.mk +++ b/native/jni/NativeFileList.mk @@ -32,7 +32,6 @@ LATIN_IME_CORE_SRC_FILES := \ digraph_utils.cpp \ error_type_utils.cpp \ multi_bigram_map.cpp \ - suggestions_output_utils.cpp \ word_property.cpp) \ $(addprefix suggest/core/layout/, \ additional_proximity_chars.cpp \ @@ -41,6 +40,7 @@ LATIN_IME_CORE_SRC_FILES := \ proximity_info_state.cpp \ proximity_info_state_utils.cpp) \ suggest/core/policy/weighting.cpp \ + suggest/core/result/suggestions_output_utils.cpp \ suggest/core/session/dic_traverse_session.cpp \ $(addprefix suggest/policyimpl/dictionary/, \ header/header_policy.cpp \ diff --git a/native/jni/src/suggest/core/dictionary/suggestions_output_utils.cpp b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp index 07c2e6ea9..e9fb3b885 100644 --- a/native/jni/src/suggest/core/dictionary/suggestions_output_utils.cpp +++ b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/core/dictionary/suggestions_output_utils.h" +#include "suggest/core/result/suggestions_output_utils.h" #include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node_utils.h" diff --git a/native/jni/src/suggest/core/dictionary/suggestions_output_utils.h b/native/jni/src/suggest/core/result/suggestions_output_utils.h index d456a545f..d456a545f 100644 --- a/native/jni/src/suggest/core/dictionary/suggestions_output_utils.h +++ b/native/jni/src/suggest/core/result/suggestions_output_utils.h diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp index 56acc2dc1..c3b670337 100644 --- a/native/jni/src/suggest/core/suggest.cpp +++ b/native/jni/src/suggest/core/suggest.cpp @@ -21,11 +21,11 @@ #include "suggest/core/dicnode/dic_node_vector.h" #include "suggest/core/dictionary/dictionary.h" #include "suggest/core/dictionary/digraph_utils.h" -#include "suggest/core/dictionary/suggestions_output_utils.h" #include "suggest/core/layout/proximity_info.h" #include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" #include "suggest/core/policy/traversal.h" #include "suggest/core/policy/weighting.h" +#include "suggest/core/result/suggestions_output_utils.h" #include "suggest/core/session/dic_traverse_session.h" namespace latinime { |