head 1.2; access; symbols pkgsrc-2026Q3:1.2.0.106 pkgsrc-2026Q3-base:1.2 pkgsrc-2026Q2:1.2.0.104 pkgsrc-2026Q2-base:1.2 pkgsrc-2026Q1:1.2.0.102 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.100 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.98 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.96 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.94 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.92 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.90 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.88 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.86 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.84 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.82 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.80 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.78 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.76 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.74 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.72 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.70 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.68 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.66 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.64 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.62 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.60 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.58 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.54 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.34 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.56 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.52 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.50 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.48 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.46 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.44 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.42 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.40 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.38 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.36 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.32 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.30 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.28 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.26 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.24 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.22 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.20 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.18 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.16 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.14 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.12 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.10 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.8 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.6 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.4 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.2 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.1.0.4 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.2 pkgsrc-2013Q1-base:1.1; locks; strict; comment @// @; 1.2 date 2013.09.19.13.01.01; author obache; state Exp; branches; next 1.1; commitid Cgk526EVsJg7536x; 1.1 date 2013.03.20.05.25.58; author obache; state Exp; branches; next ; desc @@ 1.2 log @resolve "call of overloaded 'log(int)' is ambiguous". @ text @$NetBSD: patch-src_lookup_pinyin__lookup.cpp,v 1.1 2013/03/20 05:25:58 obache Exp $ * use C++ style include files. * resolve "call of overloaded `log(int)' is ambiguous" * fixes bogus NULL usage, as Integer 0. --- src/lookup/pinyin_lookup.cpp.orig 2009-03-08 03:43:51.000000000 +0000 +++ src/lookup/pinyin_lookup.cpp @@@@ -20,8 +20,8 @@@@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include -#include +#include +#include #include #include "stl_lite.h" #include "novel_types.h" @@@@ -158,7 +158,7 @@@@ bool PinyinLookup::get_best_match(Pinyin } lookup_key_t initial_key = sentence_start; - lookup_value_t initial_value(log(1)); + lookup_value_t initial_value(log((gfloat)1)); initial_value.m_handles[1] = sentence_start; GArray * initial_step_content = (GArray *) g_ptr_array_index(m_steps_content, 0); initial_step_content = g_array_append_val(initial_step_content, initial_value); @@@@ -379,7 +379,7 @@@@ bool PinyinLookup::final_step(MatchResul g_array_set_size(results, m_steps_content->len); for ( size_t i = 0 ; i < m_steps_content->len ; ++i){ phrase_token_t * token = &g_array_index(results, phrase_token_t, i); - *token = NULL; + *token = 0; } //find max element size_t last_step_pos = m_steps_content->len - 1; @@@@ -430,7 +430,7 @@@@ bool PinyinLookup::train_result(PinyinKe guint32 train_factor = 23; for ( size_t i = 0; i < constraints->len; ++i){ phrase_token_t * token = &g_array_index(results, phrase_token_t, i); - if ( *token == NULL ) + if ( *token == 0 ) continue; lookup_constraint_t * constraint = &g_array_index(constraints, lookup_constraint_t, i); if (train_next || CONSTRAINT_ONESTEP == constraint->m_type ){ @@@@ -484,7 +484,7 @@@@ bool PinyinLookup::convert_to_utf8(Match result_string = g_strdup(""); for ( size_t i = 0; i < results->len; ++i){ phrase_token_t * token = &g_array_index(results, phrase_token_t, i); - if ( NULL == *token ) + if ( 0 == *token ) continue; m_phrase_index->get_phrase_item(*token, m_cache_phrase_item); utf16_t buffer[MAX_PHRASE_LENGTH]; @ 1.1 log @Fixes build on some situations: * use C++ style header files * fixes bogus NULL usage, as Integer 0. @ text @d1 1 a1 1 $NetBSD$ d4 1 d20 9 @