# HG changeset patch # User masa # Date 1454143361 -32400 # Node ID ce57fa0495a7161174554eae6dcb18997c1d0323 # Parent 432d96650d55640fddf8c6d746f1a81066e1c636# Parent 1161466f4e1b358e6a4b3d3dec78e38e79004898 merge diff -r 432d96650d55 -r ce57fa0495a7 TaskManager/ManyCore/FileMapReduce.cc --- a/TaskManager/ManyCore/FileMapReduce.cc Sat Jan 30 17:36:42 2016 +0900 +++ b/TaskManager/ManyCore/FileMapReduce.cc Sat Jan 30 17:42:41 2016 +0900 @@ -34,6 +34,7 @@ this->TASK_EXEC = TASK_EXEC; this->TASK_EXEC_DATA_PARALLEL = TASK_EXEC_DATA_PARALLEL; this->TASK_PRINT = TASK_PRINT; + w = NULL; fmp_help_str = "[-a -c -s] [-cpu spe_num] [-g] [-file filename] [-br]\n"; } diff -r 432d96650d55 -r ce57fa0495a7 TaskManager/ManyCore/FileMapReduce.h