Mercurial > hg > Game > Cerium

comparison example/regex/WordCount.h @ 1204:ffef576db4b3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modify example/regex/
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Sat, 16 Jul 2011 17:25:40 +0900
parents 7b866a392adc
children
comparison
equal deleted inserted replaced
1203:f96a3dc9cd38 1204:ffef576db4b3
15 int pad; 15 int pad;
16 char * file_mmap; 16 char * file_mmap;
17 int file_size; 17 int file_size;
18 HTaskPtr t_print; 18 HTaskPtr t_print;
19 19
20 <<<<<<< local
21
22 =======
23 //regexのENVの成分 20 //regexのENVの成分
24 >>>>>>> other
25 bool print_count; 21 bool print_count;
26 bool print_filename; 22 bool print_filename;
27 int count; 23 int count;
28 char *filename; 24 char *filename;
29 <<<<<<< local
30 } WordCount, ENV, *ENVP; 25 } WordCount, ENV, *ENVP;
31
32
33 =======
34 }WordCount;
35 //} WordCount, ENV;
36 //typedef ENV *ENVP;
37 >>>>>>> other