Merge "s/stdint.h/cstdint/"

main
Ken Wakasa 2014-04-07 05:09:24 +00:00 committed by Android (Google) Code Review
commit df80192858
35 changed files with 24 additions and 42 deletions

View File

@ -18,7 +18,6 @@
#define LATINIME_DIC_NODES_CACHE_H #define LATINIME_DIC_NODES_CACHE_H
#include <algorithm> #include <algorithm>
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/core/dicnode/dic_node_priority_queue.h" #include "suggest/core/dicnode/dic_node_priority_queue.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_DIC_NODE_PROPERTIES_H #ifndef LATINIME_DIC_NODE_PROPERTIES_H
#define LATINIME_DIC_NODE_PROPERTIES_H #define LATINIME_DIC_NODE_PROPERTIES_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -18,8 +18,8 @@
#define LATINIME_DIC_NODE_STATE_OUTPUT_H #define LATINIME_DIC_NODE_STATE_OUTPUT_H
#include <algorithm> #include <algorithm>
#include <cstdint>
#include <cstring> // for memmove() #include <cstring> // for memmove()
#include <stdint.h>
#include "defines.h" #include "defines.h"

View File

@ -18,7 +18,7 @@
#define LATINIME_DIC_NODE_STATE_SCORING_H #define LATINIME_DIC_NODE_STATE_SCORING_H
#include <algorithm> #include <algorithm>
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/core/dictionary/digraph_utils.h" #include "suggest/core/dictionary/digraph_utils.h"

View File

@ -17,8 +17,8 @@
#ifndef LATINIME_BLOOM_FILTER_H #ifndef LATINIME_BLOOM_FILTER_H
#define LATINIME_BLOOM_FILTER_H #define LATINIME_BLOOM_FILTER_H
#include <cstdint>
#include <cstring> #include <cstring>
#include <stdint.h>
#include "defines.h" #include "defines.h"

View File

@ -18,8 +18,6 @@
#include "suggest/core/dictionary/dictionary.h" #include "suggest/core/dictionary/dictionary.h"
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_header_structure_policy.h" #include "suggest/core/policy/dictionary_header_structure_policy.h"
#include "suggest/core/result/suggestion_results.h" #include "suggest/core/result/suggestion_results.h"

View File

@ -17,7 +17,6 @@
#ifndef LATINIME_DICTIONARY_H #ifndef LATINIME_DICTIONARY_H
#define LATINIME_DICTIONARY_H #define LATINIME_DICTIONARY_H
#include <stdint.h>
#include <memory> #include <memory>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_ERROR_TYPE_UTILS_H #ifndef LATINIME_ERROR_TYPE_UTILS_H
#define LATINIME_ERROR_TYPE_UTILS_H #define LATINIME_ERROR_TYPE_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,6 @@
#ifndef LATINIME_DIC_TRAVERSE_SESSION_H #ifndef LATINIME_DIC_TRAVERSE_SESSION_H
#define LATINIME_DIC_TRAVERSE_SESSION_H #define LATINIME_DIC_TRAVERSE_SESSION_H
#include <stdint.h>
#include <vector> #include <vector>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_BIGRAM_LIST_POLICY_H #ifndef LATINIME_BIGRAM_LIST_POLICY_H
#define LATINIME_BIGRAM_LIST_POLICY_H #define LATINIME_BIGRAM_LIST_POLICY_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_bigrams_structure_policy.h" #include "suggest/core/policy/dictionary_bigrams_structure_policy.h"

View File

@ -17,8 +17,8 @@
#ifndef LATINIME_BIGRAM_LIST_READ_WRITE_UTILS_H #ifndef LATINIME_BIGRAM_LIST_READ_WRITE_UTILS_H
#define LATINIME_BIGRAM_LIST_READ_WRITE_UTILS_H #define LATINIME_BIGRAM_LIST_READ_WRITE_UTILS_H
#include <cstdint>
#include <cstdlib> #include <cstdlib>
#include <stdint.h>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_HEADER_POLICY_H #ifndef LATINIME_HEADER_POLICY_H
#define LATINIME_HEADER_POLICY_H #define LATINIME_HEADER_POLICY_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_header_structure_policy.h" #include "suggest/core/policy/dictionary_header_structure_policy.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_HEADER_READ_WRITE_UTILS_H #ifndef LATINIME_HEADER_READ_WRITE_UTILS_H
#define LATINIME_HEADER_READ_WRITE_UTILS_H #define LATINIME_HEADER_READ_WRITE_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_header_structure_policy.h" #include "suggest/core/policy/dictionary_header_structure_policy.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_SHORTCUT_LIST_POLICY_H #ifndef LATINIME_SHORTCUT_LIST_POLICY_H
#define LATINIME_SHORTCUT_LIST_POLICY_H #define LATINIME_SHORTCUT_LIST_POLICY_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_SHORTCUT_LIST_READING_UTILS_H #ifndef LATINIME_SHORTCUT_LIST_READING_UTILS_H
#define LATINIME_SHORTCUT_LIST_READING_UTILS_H #define LATINIME_SHORTCUT_LIST_READING_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -17,8 +17,6 @@
#ifndef LATINIME_VER4_SHORTCUT_LIST_POLICY_H #ifndef LATINIME_VER4_SHORTCUT_LIST_POLICY_H
#define LATINIME_VER4_SHORTCUT_LIST_POLICY_H #define LATINIME_VER4_SHORTCUT_LIST_POLICY_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_shortcuts_structure_policy.h" #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
#include "suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h" #include "suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h"

View File

@ -17,7 +17,6 @@
#include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h" #include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
#include <climits> #include <climits>
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h" #include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h"

View File

@ -17,8 +17,6 @@
#ifndef LATINIME_DICTIONARY_STRUCTURE_WITH_BUFFER_POLICY_FACTORY_H #ifndef LATINIME_DICTIONARY_STRUCTURE_WITH_BUFFER_POLICY_FACTORY_H
#define LATINIME_DICTIONARY_STRUCTURE_WITH_BUFFER_POLICY_FACTORY_H #define LATINIME_DICTIONARY_STRUCTURE_WITH_BUFFER_POLICY_FACTORY_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h" #include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_DYNAMIC_PT_READING_UTILS_H #ifndef LATINIME_DYNAMIC_PT_READING_UTILS_H
#define LATINIME_DYNAMIC_PT_READING_UTILS_H #define LATINIME_DYNAMIC_PT_READING_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -17,8 +17,6 @@
#ifndef LATINIME_DYNAMIC_PT_UPDATING_HELPER_H #ifndef LATINIME_DYNAMIC_PT_UPDATING_HELPER_H
#define LATINIME_DYNAMIC_PT_UPDATING_HELPER_H #define LATINIME_DYNAMIC_PT_UPDATING_HELPER_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
#include "utils/hash_map_compat.h" #include "utils/hash_map_compat.h"

View File

@ -17,8 +17,8 @@
#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
#include <cstddef> #include <cstddef>
#include <cstdint>
#include <cstdlib> #include <cstdlib>
#include <stdint.h>
#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_PATRICIA_TRIE_POLICY_H #ifndef LATINIME_PATRICIA_TRIE_POLICY_H
#define LATINIME_PATRICIA_TRIE_POLICY_H #define LATINIME_PATRICIA_TRIE_POLICY_H
#include <stdint.h> #include <cstdint>
#include <vector> #include <vector>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_PATRICIA_TRIE_READING_UTILS_H #ifndef LATINIME_PATRICIA_TRIE_READING_UTILS_H
#define LATINIME_PATRICIA_TRIE_READING_UTILS_H #define LATINIME_PATRICIA_TRIE_READING_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_VER2_PATRICIA_TRIE_NODE_READER_H #ifndef LATINIME_VER2_PATRICIA_TRIE_NODE_READER_H
#define LATINIME_VER2_PATRICIA_TRIE_NODE_READER_H #define LATINIME_VER2_PATRICIA_TRIE_NODE_READER_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_VER2_PT_NODE_ARRAY_READER_H #ifndef LATINIME_VER2_PT_NODE_ARRAY_READER_H
#define LATINIME_VER2_PT_NODE_ARRAY_READER_H #define LATINIME_VER2_PT_NODE_ARRAY_READER_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h"

View File

@ -17,8 +17,6 @@
#ifndef LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H #ifndef LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H
#define LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H #define LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"

View File

@ -17,8 +17,6 @@
#ifndef LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H #ifndef LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H
#define LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H #define LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h" #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
#include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h" #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_VER4_PATRICIA_TRIE_READING_UTILS_H #ifndef LATINIME_VER4_PATRICIA_TRIE_READING_UTILS_H
#define LATINIME_VER4_PATRICIA_TRIE_READING_UTILS_H #define LATINIME_VER4_PATRICIA_TRIE_READING_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -18,7 +18,7 @@
#define LATINIME_BUFFER_WITH_EXTENDABLE_BUFFER_H #define LATINIME_BUFFER_WITH_EXTENDABLE_BUFFER_H
#include <cstddef> #include <cstddef>
#include <stdint.h> #include <cstdint>
#include <vector> #include <vector>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_BYTE_ARRAY_UTILS_H #ifndef LATINIME_BYTE_ARRAY_UTILS_H
#define LATINIME_BYTE_ARRAY_UTILS_H #define LATINIME_BYTE_ARRAY_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_FORMAT_UTILS_H #ifndef LATINIME_FORMAT_UTILS_H
#define LATINIME_FORMAT_UTILS_H #define LATINIME_FORMAT_UTILS_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"

View File

@ -17,8 +17,8 @@
#ifndef LATINIME_MMAPPED_BUFFER_H #ifndef LATINIME_MMAPPED_BUFFER_H
#define LATINIME_MMAPPED_BUFFER_H #define LATINIME_MMAPPED_BUFFER_H
#include <cstdint>
#include <memory> #include <memory>
#include <stdint.h>
#include "defines.h" #include "defines.h"

View File

@ -17,8 +17,6 @@
#ifndef LATINIME_PROBABILITY_UTILS_H #ifndef LATINIME_PROBABILITY_UTILS_H
#define LATINIME_PROBABILITY_UTILS_H #define LATINIME_PROBABILITY_UTILS_H
#include <stdint.h>
#include "defines.h" #include "defines.h"
namespace latinime { namespace latinime {

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_SPARSE_TABLE_H #ifndef LATINIME_SPARSE_TABLE_H
#define LATINIME_SPARSE_TABLE_H #define LATINIME_SPARSE_TABLE_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h" #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"

View File

@ -17,7 +17,7 @@
#ifndef LATINIME_TYPING_TRAVERSAL_H #ifndef LATINIME_TYPING_TRAVERSAL_H
#define LATINIME_TYPING_TRAVERSAL_H #define LATINIME_TYPING_TRAVERSAL_H
#include <stdint.h> #include <cstdint>
#include "defines.h" #include "defines.h"
#include "suggest/core/dicnode/dic_node.h" #include "suggest/core/dicnode/dic_node.h"