From e13055bcabe4fa7d91c79f9938d55147990d1ec4 Mon Sep 17 00:00:00 2001 From: Peng Wu Date: Wed, 17 Apr 2013 13:58:33 +0800 Subject: write merge_sequence function --- src/storage/phrase_large_table2.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/storage') diff --git a/src/storage/phrase_large_table2.h b/src/storage/phrase_large_table2.h index 34bb12d..d92fa0e 100644 --- a/src/storage/phrase_large_table2.h +++ b/src/storage/phrase_large_table2.h @@ -118,7 +118,7 @@ public: static inline int reduce_tokens(const PhraseTokens tokens, - GArray * tokenarray) { + TokenVector tokenarray) { int num = 0; g_array_set_size(tokenarray, 0); @@ -143,7 +143,7 @@ static inline int get_first_token(const PhraseTokens tokens, /* out */ phrase_token_t & token){ token = null_token; - GArray * tokenarray = g_array_new(FALSE, FALSE, sizeof(phrase_token_t)); + TokenVector tokenarray = g_array_new(FALSE, FALSE, sizeof(phrase_token_t)); int num = reduce_tokens(tokens, tokenarray); if (num) token = g_array_index(tokenarray, phrase_token_t, 0); -- cgit