Mercurial > hg > Game > Cerium

comparison example/regex/WordCount.h @ 1200:7b866a392adc draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mege 1179
author Nobuyasu Oshiro <dimolto@cr.ie.u-ryukyu.ac.jp>
date Thu, 14 Jul 2011 18:51:10 +0900
parents e55b9d2cb33e 2abd68a1ac2a
children ffef576db4b3
comparison
equal deleted inserted replaced
1199:e55b9d2cb33e 1200:7b866a392adc
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
20 21
22 =======
23 //regexのENVの成分
24 >>>>>>> other
21 bool print_count; 25 bool print_count;
22 bool print_filename; 26 bool print_filename;
23 int count; 27 int count;
24 char *filename; 28 char *filename;
29 <<<<<<< local
25 } WordCount, ENV, *ENVP; 30 } WordCount, ENV, *ENVP;
26 31
27 32
33 =======
34 }WordCount;
35 //} WordCount, ENV;
36 //typedef ENV *ENVP;
37 >>>>>>> other