Mercurial > hg > Members > innparusu > Gears

changeset 107:67f68f9c04b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp>
date Mon, 11 Apr 2016 01:45:22 +0900
parents 870453d5b096 (current diff) 828ab677c8ef (diff)
children 4db311ba1289 059b26a250cc
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/parallel_execution/CMakeLists.txt	Tue Mar 15 11:57:46 2016 +0900
+++ b/src/parallel_execution/CMakeLists.txt	Mon Apr 11 01:45:22 2016 +0900
@@ -3,7 +3,7 @@
 # -DUSE_CUDA
 add_definitions("-Wall -g -O0")
 
-set(CMAKE_C_COMPILER cbclang)
+set(CMAKE_C_COMPILER clang)
 
 add_executable(twice
                main.c
--- a/src/parallel_execution/context.h	Tue Mar 15 11:57:46 2016 +0900
+++ b/src/parallel_execution/context.h	Mon Apr 11 01:45:22 2016 +0900
@@ -128,6 +128,8 @@
     struct Task {
         enum Code code;
         int key;
+        struct Queue* wait_me;
+        struct Queue* wait_i;
     } task;
     struct Queue {
         struct Element* first;