# HG changeset patch
# User Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp>
# Date 1388039586 -32400
# Node ID 5e06a8089625550d3a93d9e68819d5a2e5e05f13
# Parent  14225fec047c739ecb6ed2190b4af770c5670958# Parent  7706faa6b0c9b76ebb12e9857dbbe45313b74af8
merge

diff -r 14225fec047c -r 5e06a8089625 example/fileread/main.cc
--- a/example/fileread/main.cc	Thu Dec 26 15:30:15 2013 +0900
+++ b/example/fileread/main.cc	Thu Dec 26 15:33:06 2013 +0900
@@ -52,8 +52,11 @@
             read->set_param(2,(long)fr->division_size);
         }
         read->set_param(3,(long)fr->fd);  //fdの番号の受け渡し
+<<<<<<< local
 
         read->set_outData(0,read_text + fr->task_number*fr->division_size, fr->division_size);
+=======
+>>>>>>> other
 
         fr->t_print->wait_for(read);
         read->spawn();
@@ -63,7 +66,11 @@
     }
 
     if (fr->left_size > 0) {
+<<<<<<< local
         HTaskPtr next = manager->create_task(RUN_BLOCKS, (memaddr)&fr->self, sizeof(memaddr),read_text,fr->filesize);
+=======
+        HTaskPtr next = manager->create_task(RUN_BLOCKS, (memaddr)&fr->self, sizeof(memaddr),0,0);
+>>>>>>> other
         fr->t_print->wait_for(next);
         next->wait_for(wait);
         next->spawn();