change phrase_length from int to size_t

diff --git a/src/storage/chewing_large_table.cpp b/src/storage/chewing_large_table.cpp
index ff53b75..b8be274 100644 (file)
--- a/src/storage/chewing_large_table.cpp
+++ b/src/storage/chewing_large_table.cpp
@@ -56,7 +56,7 @@ public:
 };
 
 
-template<int phrase_length>
+template<size_t phrase_length>
 class ChewingArrayIndexLevel{
 protected:
     typedef PinyinIndexItem2<phrase_length> IndexItem;
@@ -384,7 +384,7 @@ int ChewingLengthIndexLevel::search(pinyin_option_t options, int phrase_length,
 }
 
 
-template<int phrase_length>
+template<size_t phrase_length>
 int ChewingArrayIndexLevel<phrase_length>::search
 (pinyin_option_t options, /* in */ChewingKey keys[],
  /* out */ PhraseIndexRanges ranges) const {
@@ -410,7 +410,7 @@ int ChewingArrayIndexLevel<phrase_length>::search
 }
 
 /* compress consecutive tokens */
-template<int phrase_length>
+template<size_t phrase_length>
 int ChewingArrayIndexLevel<phrase_length>::convert
 (pinyin_option_t options, ChewingKey keys[],
  IndexItem * begin, IndexItem * end,
@@ -573,7 +573,7 @@ int ChewingLengthIndexLevel::remove_index(int phrase_length,
 #undef CASE
 }
 
-template<int phrase_length>
+template<size_t phrase_length>
 int ChewingArrayIndexLevel<phrase_length>::add_index
 (/* in */ ChewingKey keys[], /* in */ phrase_token_t token) {
     IndexItem * begin, * end;
@@ -600,7 +600,7 @@ int ChewingArrayIndexLevel<phrase_length>::add_index
     return ERROR_OK;
 }
 
-template<int phrase_length>
+template<size_t phrase_length>
 int ChewingArrayIndexLevel<phrase_length>::remove_index
 (/* in */ ChewingKey keys[], /* in */ phrase_token_t token) {
     IndexItem * begin, * end;
@@ -874,7 +874,7 @@ bool ChewingLengthIndexLevel::store(MemoryChunk * new_chunk,
     return true;
 }
 
-template<int phrase_length>
+template<size_t phrase_length>
 bool ChewingArrayIndexLevel<phrase_length>::
 load(MemoryChunk * chunk, table_offset_t offset, table_offset_t end) {
     char * begin = (char *) chunk->begin();
@@ -882,7 +882,7 @@ load(MemoryChunk * chunk, table_offset_t offset, table_offset_t end) {
     return true;
 }
 
-template<int phrase_length>
+template<size_t phrase_length>
 bool ChewingArrayIndexLevel<phrase_length>::
 store(MemoryChunk * new_chunk, table_offset_t offset, table_offset_t & end) {
     new_chunk->set_content(offset, m_chunk.begin(), m_chunk.size());

diff --git a/src/storage/pinyin_phrase2.h b/src/storage/pinyin_phrase2.h
index 16a5b68..ba658f0 100644 (file)
--- a/src/storage/pinyin_phrase2.h
+++ b/src/storage/pinyin_phrase2.h
@@ -218,7 +218,7 @@ inline void compute_upper_value2(pinyin_option_t options,
 }
 
 
-template<int phrase_length>
+template<size_t phrase_length>
 struct PinyinIndexItem2{
     phrase_token_t m_token;
     ChewingKey m_keys[phrase_length];
@@ -231,7 +231,7 @@ public:
 
 
 /* for find the element in the phrase array */
-template<int phrase_length>
+template<size_t phrase_length>
 inline int phrase_exact_compare2(const PinyinIndexItem2<phrase_length> &lhs,
                                  const PinyinIndexItem2<phrase_length> &rhs)
 {
@@ -240,7 +240,7 @@ inline int phrase_exact_compare2(const PinyinIndexItem2<phrase_length> &lhs,
     return pinyin_exact_compare2(keys_lhs, keys_rhs, phrase_length);
 }
 
-template<int phrase_length>
+template<size_t phrase_length>
 inline bool phrase_exact_less_than2(const PinyinIndexItem2<phrase_length> &lhs,
                                     const PinyinIndexItem2<phrase_length> &rhs)
 {