diff options
| author | obache <obache@pkgsrc.org> | 2013-09-19 13:01:01 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2013-09-19 13:01:01 +0000 |
| commit | bba286b6b92f10c954409f7771900bc45ceae788 (patch) | |
| tree | 534d98f2b3fc38728d93b2e79d715bd93f8eddc0 /inputmethod | |
| parent | 3144c593e89e5fb274d00f3f886e6804c041aa12 (diff) | |
| download | pkgsrc-bba286b6b92f10c954409f7771900bc45ceae788.tar.gz | |
resolve "call of overloaded 'log(int)' is ambiguous".
Diffstat (limited to 'inputmethod')
| -rw-r--r-- | inputmethod/novel-pinyin/distinfo | 4 | ||||
| -rw-r--r-- | inputmethod/novel-pinyin/patches/patch-src_lookup_pinyin__lookup.cpp | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/inputmethod/novel-pinyin/distinfo b/inputmethod/novel-pinyin/distinfo index 94cea0d4c9f..e640442ba6c 100644 --- a/inputmethod/novel-pinyin/distinfo +++ b/inputmethod/novel-pinyin/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2013/03/20 05:25:58 obache Exp $ +$NetBSD: distinfo,v 1.3 2013/09/19 13:01:01 obache Exp $ SHA1 (novel-pinyin-0.2.5.tar.gz) = d973b122aed8b844806948e5081f342945df75ff RMD160 (novel-pinyin-0.2.5.tar.gz) = 61107040664ddf76a26191401a750ae60397fa4e @@ -9,4 +9,4 @@ SHA1 (patch-ac) = c48bb8217c590b545a494bfed95b1130a164bb5f SHA1 (patch-ad) = 16648a1a547982eac40676d40ed1c9b978476df5 SHA1 (patch-modules_scim_novel__pinyin__imengine.cpp) = 1a4e139d37139d82a62e7ed720ac13540b75cefa SHA1 (patch-src_lookup_lookup.h) = aed5a9b28eb7ac050f3b1c0ea0f2de4b09d596c5 -SHA1 (patch-src_lookup_pinyin__lookup.cpp) = 708b78d362f3339e511fb8f9ef97fa8cf4aa832f +SHA1 (patch-src_lookup_pinyin__lookup.cpp) = f5ce01b190536e7c8c870a1a2f78f0971a342f56 diff --git a/inputmethod/novel-pinyin/patches/patch-src_lookup_pinyin__lookup.cpp b/inputmethod/novel-pinyin/patches/patch-src_lookup_pinyin__lookup.cpp index 6bfeb1512e7..4b9931eb8c1 100644 --- a/inputmethod/novel-pinyin/patches/patch-src_lookup_pinyin__lookup.cpp +++ b/inputmethod/novel-pinyin/patches/patch-src_lookup_pinyin__lookup.cpp @@ -1,6 +1,7 @@ -$NetBSD: patch-src_lookup_pinyin__lookup.cpp,v 1.1 2013/03/20 05:25:58 obache Exp $ +$NetBSD: patch-src_lookup_pinyin__lookup.cpp,v 1.2 2013/09/19 13:01:01 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 @@ -16,6 +17,15 @@ $NetBSD: patch-src_lookup_pinyin__lookup.cpp,v 1.1 2013/03/20 05:25:58 obache Ex #include <iostream> #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){ |