Created
September 23, 2011 02:37
-
-
Save PyYoshi/1236629 to your computer and use it in GitHub Desktop.
VS2010でMeCab64bit版のビルド用差分 "nmake -f Makefile.msvc"でビルド
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| *** src/common.h Fri Jan 23 13:16:00 1970 | |
| --- src/common.h Fri Jan 23 13:16:00 1970 | |
| *************** | |
| *** 16,21 **** | |
| --- 16,22 ---- | |
| #include <algorithm> | |
| #include <cmath> | |
| #include <sstream> | |
| + #include <iterator> | |
| #ifdef __CYGWIN__ | |
| #define _GLIBCXX_EXPORT_TEMPLATE | |
| *** src/feature_index.cpp Fri Jan 23 13:16:00 1970 | |
| --- src/feature_index.cpp Fri Jan 23 13:16:00 1970 | |
| *************** | |
| *** 308,314 **** | |
| if (!r) goto NEXT; | |
| os_ << r; | |
| } break; | |
| ! case 't': os_ << (size_t)path->rnode->char_type; break; | |
| case 'u': os_ << ufeature; break; | |
| default: | |
| CHECK_FALSE(false) << "unkonwn meta char: " << *p; | |
| --- 308,314 ---- | |
| if (!r) goto NEXT; | |
| os_ << r; | |
| } break; | |
| ! case 't': os_ << (unsigned int)path->rnode->char_type; break; | |
| case 'u': os_ << ufeature; break; | |
| default: | |
| CHECK_FALSE(false) << "unkonwn meta char: " << *p; | |
| *** src/Makefile.msvc Fri Jan 23 13:16:00 1970 | |
| --- src/Makefile.msvc Fri Jan 23 13:16:00 1970 | |
| *************** | |
| *** 0 **** | |
| --- 1,52 ---- | |
| + CC = cl.exe | |
| + CXXC = cl.exe | |
| + LINK=link.exe | |
| + CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| + LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X64 ADVAPI32.LIB | |
| + DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| + -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 \ | |
| + -DVERSION="\"0.98"\" -DPACKAGE="\"mecab\"" \ | |
| + -DMECAB_USE_MUTEX_LOCK \ | |
| + -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| + INC = -I. -I.. | |
| + DEL = del | |
| + | |
| + OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| + char_property.obj learner_tagger.obj tagger.obj \ | |
| + connector.obj tokenizer.obj \ | |
| + context_id.obj dictionary.obj utils.obj \ | |
| + dictionary_compiler.obj viterbi.obj \ | |
| + dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| + dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| + | |
| + .c.obj: | |
| + $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| + | |
| + .cpp.obj: | |
| + $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| + | |
| + all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| + | |
| + mecab: $(OBJ) mecab.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| + | |
| + mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| + | |
| + mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| + | |
| + mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| + | |
| + mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| + | |
| + mecab-test-gen: mecab-test-gen.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| + | |
| + libmecab: $(OBJ) libmecab.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| + | |
| + clean: | |
| + $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| *** src/Makefile.msvc.in Fri Jan 23 13:16:00 1970 | |
| --- src/Makefile.msvc.in Fri Jan 23 13:16:00 1970 | |
| *************** | |
| *** 1,52 **** | |
| - CC = cl.exe | |
| - CXXC = cl.exe | |
| - LINK=link.exe | |
| - CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| - LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X86 ADVAPI32.LIB | |
| - DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| - -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=@DIC_VERSION@ \ | |
| - -DVERSION="\"@VERSION@\"" -DPACKAGE="\"mecab\"" \ | |
| - -DMECAB_USE_MUTEX_LOCK \ | |
| - -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| - INC = -I. -I.. | |
| - DEL = del | |
| - | |
| - OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| - char_property.obj learner_tagger.obj tagger.obj \ | |
| - connector.obj tokenizer.obj \ | |
| - context_id.obj dictionary.obj utils.obj \ | |
| - dictionary_compiler.obj viterbi.obj \ | |
| - dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| - dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| - | |
| - .c.obj: | |
| - $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| - | |
| - .cpp.obj: | |
| - $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| - | |
| - all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| - | |
| - mecab: $(OBJ) mecab.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| - | |
| - mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| - | |
| - mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| - | |
| - mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| - | |
| - mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| - | |
| - mecab-test-gen: mecab-test-gen.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| - | |
| - libmecab: $(OBJ) libmecab.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| - | |
| - clean: | |
| - $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| --- 0 ---- | |
| *** src/mecab.h Fri Jan 23 13:16:00 1970 | |
| --- src/mecab.h Fri Jan 23 13:16:00 1970 | |
| *************** | |
| *** 251,262 **** | |
| virtual ~Tagger() {} | |
| ! #ifndef SIWG | |
| static Tagger* create(int argc, char **argv); | |
| static Tagger* create(const char *arg); | |
| - #endif | |
| static const char *version(); | |
| }; | |
| /* factory method */ | |
| --- 251,262 ---- | |
| virtual ~Tagger() {} | |
| ! #ifndef SWIG | |
| static Tagger* create(int argc, char **argv); | |
| static Tagger* create(const char *arg); | |
| static const char *version(); | |
| + #endif | |
| }; | |
| /* factory method */ | |
| *** src/writer.cpp Fri Jan 23 13:16:00 1970 | |
| --- src/writer.cpp Fri Jan 23 13:16:00 1970 | |
| *************** | |
| *** 233,239 **** | |
| // input sentence | |
| case 'S': os->write(sentence, std::strlen(sentence)); break; | |
| // sentence length | |
| ! case 'L': *os << std::strlen(sentence); break; | |
| // morph | |
| case 'm': os->write(node->surface, node->length); break; | |
| case 'M': os->write(reinterpret_cast<const char *> | |
| --- 233,239 ---- | |
| // input sentence | |
| case 'S': os->write(sentence, std::strlen(sentence)); break; | |
| // sentence length | |
| ! case 'L': *os << (unsigned int)std::strlen(sentence); break; | |
| // morph | |
| case 'm': os->write(node->surface, node->length); break; | |
| case 'M': os->write(reinterpret_cast<const char *> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 18a19 | |
| > #include <iterator> | |
| 311c311 | |
| < case 't': os_ << (size_t)path->rnode->char_type; break; | |
| --- | |
| > case 't': os_ << (unsigned int)path->rnode->char_type; break; | |
| 0a1,52 | |
| > CC = cl.exe | |
| > CXXC = cl.exe | |
| > LINK=link.exe | |
| > CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| > LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X64 ADVAPI32.LIB | |
| > DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| > -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 \ | |
| > -DVERSION="\"0.98"\" -DPACKAGE="\"mecab\"" \ | |
| > -DMECAB_USE_MUTEX_LOCK \ | |
| > -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| > INC = -I. -I.. | |
| > DEL = del | |
| > | |
| > OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| > char_property.obj learner_tagger.obj tagger.obj \ | |
| > connector.obj tokenizer.obj \ | |
| > context_id.obj dictionary.obj utils.obj \ | |
| > dictionary_compiler.obj viterbi.obj \ | |
| > dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| > dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| > | |
| > .c.obj: | |
| > $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| > | |
| > .cpp.obj: | |
| > $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| > | |
| > all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| > | |
| > mecab: $(OBJ) mecab.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| > | |
| > mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| > | |
| > mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| > | |
| > mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| > | |
| > mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| > | |
| > mecab-test-gen: mecab-test-gen.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| > | |
| > libmecab: $(OBJ) libmecab.obj | |
| > $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| > | |
| > clean: | |
| > $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| 1,52d0 | |
| < CC = cl.exe | |
| < CXXC = cl.exe | |
| < LINK=link.exe | |
| < CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| < LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X86 ADVAPI32.LIB | |
| < DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| < -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=@DIC_VERSION@ \ | |
| < -DVERSION="\"@VERSION@\"" -DPACKAGE="\"mecab\"" \ | |
| < -DMECAB_USE_MUTEX_LOCK \ | |
| < -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| < INC = -I. -I.. | |
| < DEL = del | |
| < | |
| < OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| < char_property.obj learner_tagger.obj tagger.obj \ | |
| < connector.obj tokenizer.obj \ | |
| < context_id.obj dictionary.obj utils.obj \ | |
| < dictionary_compiler.obj viterbi.obj \ | |
| < dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| < dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| < | |
| < .c.obj: | |
| < $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| < | |
| < .cpp.obj: | |
| < $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| < | |
| < all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| < | |
| < mecab: $(OBJ) mecab.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| < | |
| < mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| < | |
| < mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| < | |
| < mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| < | |
| < mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| < | |
| < mecab-test-gen: mecab-test-gen.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| < | |
| < libmecab: $(OBJ) libmecab.obj | |
| < $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| < | |
| < clean: | |
| < $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| 254c254 | |
| < #ifndef SIWG | |
| --- | |
| > #ifndef SWIG | |
| 257d256 | |
| < #endif | |
| 259a259 | |
| > #endif | |
| 236c236 | |
| < case 'L': *os << std::strlen(sentence); break; | |
| --- | |
| > case 'L': *os << (unsigned int)std::strlen(sentence); break; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> | |
| <html> | |
| <head> | |
| <title>WinMerge File Compare Report</title> | |
| </head> | |
| <style type="text/css"> | |
| <!-- | |
| HTML, BODY { | |
| color: #000000; | |
| background-color: #ffffff; | |
| } | |
| table { | |
| width: 100%; | |
| margin: 0; | |
| border: none; | |
| } | |
| A:link { color: #0000ff; } | |
| A:visited { color: #880088; } | |
| A:active { color: #0000ff; } | |
| /** Navigation Headers ***/ | |
| .vc_navheader { | |
| background-color: #8888ff; | |
| } | |
| /*** Table Headers ***/ | |
| .vc_header { | |
| text-align: left; | |
| background-color: #cccccc; | |
| } | |
| .vc_header_sort { | |
| text-align: left; | |
| background-color: #88ff88; | |
| } | |
| /*** Table Rows ***/ | |
| .vc_row_even { | |
| background-color: #ffffff; | |
| } | |
| .vc_row_odd { | |
| background-color: #ccccee; | |
| } | |
| /*** Markup Summary Header ***/ | |
| .vc_summary { | |
| background-color: #eeeeee; | |
| } | |
| /*** Colour Diff Styles ***/ | |
| .vc_diff_header { | |
| background-color: #ffffff; | |
| } | |
| .vc_diff_chunk_header { | |
| background-color: #99cccc; | |
| } | |
| .vc_diff_chunk_extra { | |
| font-size: smaller; | |
| } | |
| .vc_diff_empty { | |
| background-color: #cccccc; | |
| font-family: sans-serif; | |
| font-size: smaller; | |
| } | |
| .vc_diff_add { | |
| background-color: #aaffaa; | |
| font-family: sans-serif; | |
| font-size: smaller; | |
| } | |
| .vc_diff_remove { | |
| background-color: #ffaaaa; | |
| font-family: sans-serif; | |
| font-size: smaller; | |
| } | |
| .vc_diff_change { | |
| background-color: #ffff77; | |
| font-family: sans-serif; | |
| font-size: smaller; | |
| } | |
| .vc_diff_change_empty { | |
| background-color: #eeee77; | |
| font-family: sans-serif; | |
| font-size: smaller; | |
| } | |
| .vc_diff_nochange { | |
| font-family: sans-serif; | |
| font-size: smaller; | |
| } | |
| /*** Query Form ***/ | |
| .vc_query_form { | |
| background-color: #e6e6e6; | |
| } | |
| --> | |
| </style> | |
| <body> | |
| Left: src/common.h<br />Right: src/common.h<br /><br /><table cellspacing="0" cellpadding="0"> | |
| <tr class="vc_diff_header"> | |
| <th style="width:50%; vertical-align:top;">Left: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| <th style="width:50%; vertical-align:top;">Right: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| </tr> | |
| <tr class="vc_diff_chunk_header"> | |
| <td style="width:50%;"> | |
| <strong>Line 16</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| <td style="width:50%;"> | |
| <strong>Line 16</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> #include <algorithm> | |
| </td> | |
| <td class="vc_diff_nochange"> #include <algorithm> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> #include <cmath> | |
| </td> | |
| <td class="vc_diff_nochange"> #include <cmath> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> #include <sstream> | |
| </td> | |
| <td class="vc_diff_nochange"> #include <sstream> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> #include <iterator> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> #ifdef __CYGWIN__ | |
| </td> | |
| <td class="vc_diff_nochange"> #ifdef __CYGWIN__ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> #define _GLIBCXX_EXPORT_TEMPLATE | |
| </td> | |
| <td class="vc_diff_nochange"> #define _GLIBCXX_EXPORT_TEMPLATE | |
| </td> | |
| </tr> | |
| </table> | |
| Left: src/feature_index.cpp<br />Right: src/feature_index.cpp<br /><br /><table cellspacing="0" cellpadding="0"> | |
| <tr class="vc_diff_header"> | |
| <th style="width:50%; vertical-align:top;">Left: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| <th style="width:50%; vertical-align:top;">Right: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| </tr> | |
| <tr class="vc_diff_chunk_header"> | |
| <td style="width:50%;"> | |
| <strong>Line 308</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| <td style="width:50%;"> | |
| <strong>Line 308</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> if (!r) goto NEXT; | |
| </td> | |
| <td class="vc_diff_nochange"> if (!r) goto NEXT; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> os_ << r; | |
| </td> | |
| <td class="vc_diff_nochange"> os_ << r; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> } break; | |
| </td> | |
| <td class="vc_diff_nochange"> } break; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_change"> case 't': os_ << (size_t)path->rnode->char_type; break; | |
| </td> | |
| <td class="vc_diff_change"> case 't': os_ << (unsigned int)path->rnode->char_type; break; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> case 'u': os_ << ufeature; break; | |
| </td> | |
| <td class="vc_diff_nochange"> case 'u': os_ << ufeature; break; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> default: | |
| </td> | |
| <td class="vc_diff_nochange"> default: | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> CHECK_FALSE(false) << "unkonwn meta char: " << *p; | |
| </td> | |
| <td class="vc_diff_nochange"> CHECK_FALSE(false) << "unkonwn meta char: " << *p; | |
| </td> | |
| </tr> | |
| </table> | |
| Left: src/Makefile.msvc<br />Right: src/Makefile.msvc<br /><br /><table cellspacing="0" cellpadding="0"> | |
| <tr class="vc_diff_header"> | |
| <th style="width:50%; vertical-align:top;">Left: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| <th style="width:50%; vertical-align:top;">Right: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| </tr> | |
| <tr class="vc_diff_chunk_header"> | |
| <td style="width:50%;"> | |
| <strong>Line 1</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| <td style="width:50%;"> | |
| <strong>Line 1</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> CC = cl.exe | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> CXXC = cl.exe | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> LINK=link.exe | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X64 ADVAPI32.LIB | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> -DVERSION="\"0.98"\" -DPACKAGE="\"mecab\"" \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> -DMECAB_USE_MUTEX_LOCK \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> INC = -I. -I.. | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> DEL = del | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> char_property.obj learner_tagger.obj tagger.obj \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> connector.obj tokenizer.obj \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> context_id.obj dictionary.obj utils.obj \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> dictionary_compiler.obj viterbi.obj \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> .c.obj: | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> .cpp.obj: | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> mecab: $(OBJ) mecab.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> mecab-test-gen: mecab-test-gen.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> libmecab: $(OBJ) libmecab.obj | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> clean: | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| </td> | |
| </tr> | |
| </table> | |
| Left: src/Makefile.msvc.in<br />Right: src/Makefile.msvc.in<br /><br /><table cellspacing="0" cellpadding="0"> | |
| <tr class="vc_diff_header"> | |
| <th style="width:50%; vertical-align:top;">Left: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| <th style="width:50%; vertical-align:top;">Right: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| </tr> | |
| <tr class="vc_diff_chunk_header"> | |
| <td style="width:50%;"> | |
| <strong>Line 1</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| <td style="width:50%;"> | |
| <strong>Line 1</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> CC = cl.exe | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> CXXC = cl.exe | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> LINK=link.exe | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X86 ADVAPI32.LIB | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=@DIC_VERSION@ \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> -DVERSION="\"@VERSION@\"" -DPACKAGE="\"mecab\"" \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> -DMECAB_USE_MUTEX_LOCK \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> INC = -I. -I.. | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> DEL = del | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> char_property.obj learner_tagger.obj tagger.obj \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> connector.obj tokenizer.obj \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> context_id.obj dictionary.obj utils.obj \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> dictionary_compiler.obj viterbi.obj \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> .c.obj: | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> .cpp.obj: | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> mecab: $(OBJ) mecab.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> mecab-test-gen: mecab-test-gen.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> libmecab: $(OBJ) libmecab.obj | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> clean: | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| </table> | |
| Left: src/mecab.h<br />Right: src/mecab.h<br /><br /><table cellspacing="0" cellpadding="0"> | |
| <tr class="vc_diff_header"> | |
| <th style="width:50%; vertical-align:top;">Left: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| <th style="width:50%; vertical-align:top;">Right: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| </tr> | |
| <tr class="vc_diff_chunk_header"> | |
| <td style="width:50%;"> | |
| <strong>Line 251</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| <td style="width:50%;"> | |
| <strong>Line 251</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> virtual ~Tagger() {} | |
| </td> | |
| <td class="vc_diff_nochange"> virtual ~Tagger() {} | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_change"> #ifndef SIWG | |
| </td> | |
| <td class="vc_diff_change"> #ifndef SWIG | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> static Tagger* create(int argc, char **argv); | |
| </td> | |
| <td class="vc_diff_nochange"> static Tagger* create(int argc, char **argv); | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> static Tagger* create(const char *arg); | |
| </td> | |
| <td class="vc_diff_nochange"> static Tagger* create(const char *arg); | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_remove"> #endif | |
| </td> | |
| <td class="vc_diff_empty"> </td> </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> static const char *version(); | |
| </td> | |
| <td class="vc_diff_nochange"> static const char *version(); | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_empty"> </td> <td class="vc_diff_add"> #endif | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> }; | |
| </td> | |
| <td class="vc_diff_nochange"> }; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| <td class="vc_diff_nochange"> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> /* factory method */ | |
| </td> | |
| <td class="vc_diff_nochange"> /* factory method */ | |
| </td> | |
| </tr> | |
| </table> | |
| Left: src/writer.cpp<br />Right: src/writer.cpp<br /><br /><table cellspacing="0" cellpadding="0"> | |
| <tr class="vc_diff_header"> | |
| <th style="width:50%; vertical-align:top;">Left: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| <th style="width:50%; vertical-align:top;">Right: Fri Jan 23 13:16:00 1970 | |
| </th> | |
| </tr> | |
| <tr class="vc_diff_chunk_header"> | |
| <td style="width:50%;"> | |
| <strong>Line 233</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| <td style="width:50%;"> | |
| <strong>Line 233</strong> | |
| <span class="vc_diff_chunk_extra"></span> | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> // input sentence | |
| </td> | |
| <td class="vc_diff_nochange"> // input sentence | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> case 'S': os->write(sentence, std::strlen(sentence)); break; | |
| </td> | |
| <td class="vc_diff_nochange"> case 'S': os->write(sentence, std::strlen(sentence)); break; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> // sentence length | |
| </td> | |
| <td class="vc_diff_nochange"> // sentence length | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_change"> case 'L': *os << std::strlen(sentence); break; | |
| </td> | |
| <td class="vc_diff_change"> case 'L': *os << (unsigned int)std::strlen(sentence); break; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> // morph | |
| </td> | |
| <td class="vc_diff_nochange"> // morph | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> case 'm': os->write(node->surface, node->length); break; | |
| </td> | |
| <td class="vc_diff_nochange"> case 'm': os->write(node->surface, node->length); break; | |
| </td> | |
| </tr> | |
| <tr> | |
| <td class="vc_diff_nochange"> case 'M': os->write(reinterpret_cast<const char *> | |
| </td> | |
| <td class="vc_diff_nochange"> case 'M': os->write(reinterpret_cast<const char *> | |
| </td> | |
| </tr> | |
| </table> | |
| </body> | |
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- src/common.h Fri Jan 23 13:16:00 1970 | |
| +++ src/common.h Fri Jan 23 13:16:00 1970 | |
| @@ -16,6 +16,7 @@ | |
| #include <algorithm> | |
| #include <cmath> | |
| #include <sstream> | |
| +#include <iterator> | |
| #ifdef __CYGWIN__ | |
| #define _GLIBCXX_EXPORT_TEMPLATE | |
| --- src/feature_index.cpp Fri Jan 23 13:16:00 1970 | |
| +++ src/feature_index.cpp Fri Jan 23 13:16:00 1970 | |
| @@ -308,7 +308,7 @@ | |
| if (!r) goto NEXT; | |
| os_ << r; | |
| } break; | |
| - case 't': os_ << (size_t)path->rnode->char_type; break; | |
| + case 't': os_ << (unsigned int)path->rnode->char_type; break; | |
| case 'u': os_ << ufeature; break; | |
| default: | |
| CHECK_FALSE(false) << "unkonwn meta char: " << *p; | |
| --- src/Makefile.msvc Fri Jan 23 13:16:00 1970 | |
| +++ src/Makefile.msvc Fri Jan 23 13:16:00 1970 | |
| @@ -0,0 +1,52 @@ | |
| +CC = cl.exe | |
| +CXXC = cl.exe | |
| +LINK=link.exe | |
| +CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| +LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X64 ADVAPI32.LIB | |
| +DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| + -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=102 \ | |
| + -DVERSION="\"0.98"\" -DPACKAGE="\"mecab\"" \ | |
| + -DMECAB_USE_MUTEX_LOCK \ | |
| + -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| +INC = -I. -I.. | |
| +DEL = del | |
| + | |
| +OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| + char_property.obj learner_tagger.obj tagger.obj \ | |
| + connector.obj tokenizer.obj \ | |
| + context_id.obj dictionary.obj utils.obj \ | |
| + dictionary_compiler.obj viterbi.obj \ | |
| + dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| + dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| + | |
| +.c.obj: | |
| + $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| + | |
| +.cpp.obj: | |
| + $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| + | |
| +all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| + | |
| +mecab: $(OBJ) mecab.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| + | |
| +mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| + | |
| +mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| + | |
| +mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| + | |
| +mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| + | |
| +mecab-test-gen: mecab-test-gen.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| + | |
| +libmecab: $(OBJ) libmecab.obj | |
| + $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| + | |
| +clean: | |
| + $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| --- src/Makefile.msvc.in Fri Jan 23 13:16:00 1970 | |
| +++ src/Makefile.msvc.in Fri Jan 23 13:16:00 1970 | |
| @@ -1,52 +0,0 @@ | |
| -CC = cl.exe | |
| -CXXC = cl.exe | |
| -LINK=link.exe | |
| -CFLAGS = /EHsc /O2 /GL /GA /Ob2 /nologo /W3 /MT /Zi /wd4800 /wd4305 /wd4244 | |
| -LDFLAGS = /nologo /OPT:REF /OPT:ICF /LTCG /NXCOMPAT /DYNAMICBASE /MACHINE:X86 ADVAPI32.LIB | |
| -DEFS = -D_CRT_SECURE_NO_DEPRECATE -DMECAB_USE_THREAD \ | |
| - -DDLL_EXPORT -DHAVE_GETENV -DHAVE_WINDOWS_H -DDIC_VERSION=@DIC_VERSION@ \ | |
| - -DVERSION="\"@VERSION@\"" -DPACKAGE="\"mecab\"" \ | |
| - -DMECAB_USE_MUTEX_LOCK \ | |
| - -DMECAB_DEFAULT_RC="\"c:\\Program Files\\mecab\\etc\\mecabrc\"" | |
| -INC = -I. -I.. | |
| -DEL = del | |
| - | |
| -OBJ = feature_index.obj param.obj learner.obj string_buffer.obj \ | |
| - char_property.obj learner_tagger.obj tagger.obj \ | |
| - connector.obj tokenizer.obj \ | |
| - context_id.obj dictionary.obj utils.obj \ | |
| - dictionary_compiler.obj viterbi.obj \ | |
| - dictionary_generator.obj writer.obj iconv_utils.obj \ | |
| - dictionary_rewriter.obj lbfgs.obj eval.obj nbest_generator.obj | |
| - | |
| -.c.obj: | |
| - $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| - | |
| -.cpp.obj: | |
| - $(CC) $(CFLAGS) $(INC) $(DEFS) -c $< | |
| - | |
| -all: libmecab mecab mecab-dict-index mecab-dict-gen mecab-cost-train mecab-system-eval mecab-test-gen | |
| - | |
| -mecab: $(OBJ) mecab.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab.obj libmecab.lib | |
| - | |
| -mecab-dict-index: $(OBJ) mecab-dict-index.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-index.obj libmecab.lib | |
| - | |
| -mecab-dict-gen: $(OBJ) mecab-dict-gen.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-dict-gen.obj libmecab.lib | |
| - | |
| -mecab-cost-train: $(OBJ) mecab-cost-train.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-cost-train.obj libmecab.lib | |
| - | |
| -mecab-system-eval: $(OBJ) mecab-system-eval.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-system-eval.obj libmecab.lib | |
| - | |
| -mecab-test-gen: mecab-test-gen.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] mecab-test-gen.obj libmecab.lib | |
| - | |
| -libmecab: $(OBJ) libmecab.obj | |
| - $(LINK) $(LDFLAGS) /out:[email protected] $(OBJ) libmecab.obj /dll | |
| - | |
| -clean: | |
| - $(DEL) *.exe *.obj *.dll *.a *.lib *.o *.exp *.def | |
| --- src/mecab.h Fri Jan 23 13:16:00 1970 | |
| +++ src/mecab.h Fri Jan 23 13:16:00 1970 | |
| @@ -251,12 +251,12 @@ | |
| virtual ~Tagger() {} | |
| -#ifndef SIWG | |
| +#ifndef SWIG | |
| static Tagger* create(int argc, char **argv); | |
| static Tagger* create(const char *arg); | |
| -#endif | |
| static const char *version(); | |
| + #endif | |
| }; | |
| /* factory method */ | |
| --- src/writer.cpp Fri Jan 23 13:16:00 1970 | |
| +++ src/writer.cpp Fri Jan 23 13:16:00 1970 | |
| @@ -233,7 +233,7 @@ | |
| // input sentence | |
| case 'S': os->write(sentence, std::strlen(sentence)); break; | |
| // sentence length | |
| - case 'L': *os << std::strlen(sentence); break; | |
| + case 'L': *os << (unsigned int)std::strlen(sentence); break; | |
| // morph | |
| case 'm': os->write(node->surface, node->length); break; | |
| case 'M': os->write(reinterpret_cast<const char *> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment