# HG changeset patch
# User Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp>
# Date 1388082435 -32400
# Node ID c3f7ba33222d605d6f6ac4101a965352cbcee8b6
# Parent  44fa0f1320a985c7ad7e3f9733a9eddf7fc324b0
fix

diff -r 44fa0f1320a9 -r c3f7ba33222d example/fileread/main.cc
--- a/example/fileread/main.cc	Thu Dec 26 17:05:49 2013 +0900
+++ b/example/fileread/main.cc	Fri Dec 27 03:27:15 2013 +0900
@@ -52,11 +52,8 @@
             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();
@@ -66,11 +63,9 @@
     }
 
     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();