diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2008-12-29 22:35:53 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2008-12-29 22:35:53 +0000 |
commit | 887d53d3c1a5e381a037348eb69346eb832d1470 (patch) | |
tree | 57a3e5dd6a9900751db05952aeb423ea3854660c /japanese/chasen-base/files/patch-dartsdic.cpp | |
parent | - Revert deprecation (diff) |
- Update to 2.4.4
PR: 129958
Submitted by: Paul Guyot <pguyot at kallisys dot net>
Notes
Notes:
svn path=/head/; revision=224960
Diffstat (limited to 'japanese/chasen-base/files/patch-dartsdic.cpp')
-rw-r--r-- | japanese/chasen-base/files/patch-dartsdic.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/japanese/chasen-base/files/patch-dartsdic.cpp b/japanese/chasen-base/files/patch-dartsdic.cpp index 07baf60b7ec6..e9fff6e8596b 100644 --- a/japanese/chasen-base/files/patch-dartsdic.cpp +++ b/japanese/chasen-base/files/patch-dartsdic.cpp @@ -1,15 +1,6 @@ ---- lib/dartsdic.cpp.orig 2003-07-30 18:06:57.000000000 +0200 -+++ lib/dartsdic.cpp 2008-06-22 21:44:25.000000000 +0200 -@@ -68,7 +68,7 @@ - - da = (darts_t*)cha_malloc(sizeof(darts_t)); - da->da_mmap = cha_mmap_file(daname); -- darts->setArray(cha_mmap_map(da->da_mmap)); -+ darts->set_array(cha_mmap_map(da->da_mmap)); - da->da = darts; - da->lex_mmap = cha_mmap_file(lexname); - da->dat_mmap = cha_mmap_file(datname); -@@ -160,7 +160,7 @@ +--- lib/dartsdic.cpp.orig 2008-12-26 15:45:32.000000000 +0000 ++++ lib/dartsdic.cpp 2008-12-26 15:46:13.000000000 +0000 +@@ -168,7 +168,7 @@ { Hash::iterator i, last; Hash* entries = builder->entries; @@ -18,11 +9,11 @@ size_t* lens = new size_t[entries->size()]; long* vals = new long[entries->size()]; int size = 0; -@@ -177,7 +177,7 @@ +@@ -185,7 +185,7 @@ lex_indices.push_back(i->second); } lens[size] = key.size(); -- (const char*)keys[size] = key.data(); +- keys[size] = (char*) key.data(); + keys[size] = (const char*) key.data(); vals[size] = redump_lex(lens[size], lex_indices, tmpfile, lexfile); if (vals[size] < 0) { |