]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/mecab/src/common.h b/mecab/src/common.h |
2 | index d1fc459..2951d5a 100644 | |
3 | --- a/mecab/src/common.h | |
4 | +++ b/mecab/src/common.h | |
5 | @@ -86,7 +86,8 @@ | |
6 | #define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) | |
7 | #define WPATH(path) (path) | |
8 | #else | |
9 | -#define WPATH(path) WPATH_FORCE(path) | |
10 | +#define WPATH_FORCE(path) (MeCab::Utf8ToWide(path).c_str()) | |
11 | +#define WPATH(path) (path) | |
12 | #endif | |
13 | #else | |
14 | #define WPATH_FORCE(path) (path) | |
15 | diff --git a/mecab/src/feature_index.cpp b/mecab/src/feature_index.cpp | |
16 | index 051bdf8..fdd0145 100644 | |
17 | --- a/mecab/src/feature_index.cpp | |
18 | +++ b/mecab/src/feature_index.cpp | |
19 | @@ -353,7 +353,7 @@ bool FeatureIndex::buildUnigramFeature(LearnerPath *path, | |
20 | if (!r) goto NEXT; | |
21 | os_ << r; | |
22 | } break; | |
23 | - case 't': os_ << (size_t)path->rnode->char_type; break; | |
24 | + case 't': os_ << (int)(size_t)path->rnode->char_type; break; | |
25 | case 'u': os_ << ufeature; break; | |
26 | case 'w': | |
27 | if (path->rnode->stat == MECAB_NOR_NODE) { | |
28 | diff --git a/mecab/src/writer.cpp b/mecab/src/writer.cpp | |
29 | index 0ef6975..f068fa3 100644 | |
30 | --- a/mecab/src/writer.cpp | |
31 | +++ b/mecab/src/writer.cpp | |
32 | @@ -257,7 +257,7 @@ bool Writer::writeNode(Lattice *lattice, | |
33 | // input sentence | |
34 | case 'S': os->write(lattice->sentence(), lattice->size()); break; | |
35 | // sentence length | |
36 | - case 'L': *os << lattice->size(); break; | |
37 | + case 'L': *os << (int)lattice->size(); break; | |
38 | // morph | |
39 | case 'm': os->write(node->surface, node->length); break; | |
40 | case 'M': os->write(reinterpret_cast<const char *> |