changeset 341:2dd9711cd347

Fix warning for calc example
author Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp>
date Tue, 09 May 2017 02:19:43 +0900
parents 5bca0ff563e6
children de1e315379c6
files src/parallel_execution/CMakeLists.txt src/parallel_execution/examples/calc.cbc
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/CMakeLists.txt	Tue May 02 21:27:39 2017 +0900
+++ b/src/parallel_execution/CMakeLists.txt	Tue May 09 02:19:43 2017 +0900
@@ -67,7 +67,7 @@
   TARGET
       calc
   SOURCES 
-      examples/calc.cbc RedBlackTree.cbc compare.c SingleLinkedStack.cbc CPUWorker.cbc time.cbc twice.cbc TaskManagerImpl.cbc SingleLinkedQueue.cbc SynchronizedQueue.cbc SemaphoreImpl.cbc
+      examples/calc.cbc SingleLinkedStack.cbc CPUWorker.cbc time.cbc twice.cbc TaskManagerImpl.cbc SingleLinkedQueue.cbc SynchronizedQueue.cbc SemaphoreImpl.cbc
 )
 
 if (${USE_CUDA})
--- a/src/parallel_execution/examples/calc.cbc	Tue May 02 21:27:39 2017 +0900
+++ b/src/parallel_execution/examples/calc.cbc	Tue May 09 02:19:43 2017 +0900
@@ -116,7 +116,7 @@
     task->odg = task->maxIdg;
     task->data[task->odg] = (union Data*)integer3;
     task->maxOdg = task->odg + 1;
-    taskManager->task = task;
+    taskManager->context = task;
     taskManager->next = C_createTask3;
     taskManager->data = (union Data*)integer1;
     goto meta(context, taskManager->taskManager->TaskManager.setWaitTask);
@@ -157,6 +157,7 @@
     task->odg = task->maxIdg;
     task->data[task->odg] = (union Data*)integer3;
     task->maxOdg = task->odg + 1;
+    taskManager->context = task;
     taskManager->next = C_createTask1;
     goto meta(context, taskManager->taskManager->TaskManager.spawn);
 }