summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2010-11-08 17:11:13 +0800
committerPeng Wu <alexepico@gmail.com>2010-11-08 17:11:13 +0800
commit6df26a7719de824f1ce0617ee30d9cf40fc8fc79 (patch)
treef43b72cfc308fab0902cef785a29290d665bcb0c
parentf5f8fe94ffcda84c5a905fcc4a9dd452d8a12bbf (diff)
downloadlibpinyin-6df26a7719de824f1ce0617ee30d9cf40fc8fc79.tar.gz
libpinyin-6df26a7719de824f1ce0617ee30d9cf40fc8fc79.tar.xz
libpinyin-6df26a7719de824f1ce0617ee30d9cf40fc8fc79.zip
Revert "re-factor code"
-rw-r--r--src/storage/phrase_large_table.cpp3
-rw-r--r--src/storage/pinyin_large_table.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/storage/phrase_large_table.cpp b/src/storage/phrase_large_table.cpp
index 7a3bc1c..ad3262f 100644
--- a/src/storage/phrase_large_table.cpp
+++ b/src/storage/phrase_large_table.cpp
@@ -450,7 +450,8 @@ bool PhraseLengthIndexLevel::load(MemoryChunk * chunk, table_offset_t offset, ta
index++;
phrase_end = *index;
if ( phrase_begin == phrase_end ){
- g_array_append_val(m_phrase_array_indexes, null_token);
+ void * null = NULL;
+ g_array_append_val(m_phrase_array_indexes, null);
continue;
}
diff --git a/src/storage/pinyin_large_table.cpp b/src/storage/pinyin_large_table.cpp
index f92f883..0a1a8db 100644
--- a/src/storage/pinyin_large_table.cpp
+++ b/src/storage/pinyin_large_table.cpp
@@ -628,7 +628,8 @@ bool PinyinLengthIndexLevel::load(MemoryChunk * chunk, table_offset_t offset, ta
index++;
phrase_end = *index;
if ( phrase_begin == phrase_end ){
- g_array_append_val(m_pinyin_array_indexes, null_token);
+ void * null = NULL;
+ g_array_append_val(m_pinyin_array_indexes, null);
continue;
}