am 75feb0f6: Merge "Change name of header_reading_utlis.*"

* commit '75feb0f648f1449c9e25781c331b3f9806419459':
  Change name of header_reading_utlis.*
main
Keisuke Kuroyanagi 2013-09-18 02:42:27 -07:00 committed by Android Git Automerger
commit 438b1b32d6
4 changed files with 6 additions and 7 deletions

View File

@ -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 \

View File

@ -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 {

View File

@ -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>

View File

@ -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 */