diff options
author | 2013-09-18 02:42:27 -0700 | |
---|---|---|
committer | 2013-09-18 02:42:27 -0700 | |
commit | 438b1b32d62486146d565622824cfebb1fd631be (patch) | |
tree | 5ea2bbaec6ebf57b1adebc8be5d0c9c981daf221 | |
parent | c190a33a011d9e288eff14f4e9fba7d57e97adbf (diff) | |
parent | 75feb0f648f1449c9e25781c331b3f9806419459 (diff) | |
download | latinime-438b1b32d62486146d565622824cfebb1fd631be.tar.gz latinime-438b1b32d62486146d565622824cfebb1fd631be.tar.xz latinime-438b1b32d62486146d565622824cfebb1fd631be.zip |
am 75feb0f6: Merge "Change name of header_reading_utlis.*"
* commit '75feb0f648f1449c9e25781c331b3f9806419459':
Change name of header_reading_utlis.*
-rw-r--r-- | native/jni/Android.mk | 2 | ||||
-rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h | 2 | ||||
-rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp (renamed from native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp) | 2 | ||||
-rw-r--r-- | native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h (renamed from native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h) | 7 |
4 files changed, 6 insertions, 7 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index d83bdadfa..ee93b4248 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -70,7 +70,7 @@ LATIN_IME_CORE_SRC_FILES := \ bigram/bigram_list_read_write_utils.cpp \ bigram/dynamic_bigram_list_policy.cpp \ header/header_policy.cpp \ - header/header_reading_utils.cpp \ + header/header_read_write_utils.cpp \ shortcut/shortcut_list_reading_utils.cpp \ dictionary_structure_with_buffer_policy_factory.cpp \ dynamic_patricia_trie_node_reader.cpp \ diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h index cdad7de4d..6b396f3f2 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h +++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h @@ -22,7 +22,7 @@ #include "defines.h" #include "suggest/core/policy/dictionary_header_structure_policy.h" -#include "suggest/policyimpl/dictionary/header/header_reading_utils.h" +#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" #include "suggest/policyimpl/dictionary/utils/format_utils.h" namespace latinime { diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp index 705355db3..80fe88671 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "suggest/policyimpl/dictionary/header/header_reading_utils.h" +#include "suggest/policyimpl/dictionary/header/header_read_write_utils.h" #include <vector> diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h index 4b4e2205a..6cce73375 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/header/header_reading_utils.h +++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef LATINIME_HEADER_READING_UTILS_H -#define LATINIME_HEADER_READING_UTILS_H +#ifndef LATINIME_HEADER_READ_WRITE_UTILS_H +#define LATINIME_HEADER_READ_WRITE_UTILS_H #include <map> #include <stdint.h> @@ -28,7 +28,6 @@ namespace latinime { class BufferWithExtendableBuffer; -// TODO: Change this file name to header_read_write_utils.h. class HeaderReadWriteUtils { public: typedef uint16_t DictionaryFlags; @@ -91,4 +90,4 @@ class HeaderReadWriteUtils { static const DictionaryFlags CONTAINS_BIGRAMS_FLAG; }; } -#endif /* LATINIME_HEADER_READING_UTILS_H */ +#endif /* LATINIME_HEADER_READ_WRITE_UTILS_H */ |