diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-15 19:21:14 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-15 19:29:36 +0300 |
| commit | 3732508c64ad51c77a6fb83a2444af104d95cfd9 (patch) | |
| tree | e9d31126cb4c3cf6a1e7e9601ce2ba93e5282fcc /intern/cycles/util | |
| parent | 340529a8453ca9c2715c545245379e442f6006c8 (diff) | |
Fix T84745: build error with TBB 2021
task_group::is_canceling() was removed.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_task.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_task.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp index 50c236ac968..949ba0a7b4d 100644 --- a/intern/cycles/util/util_task.cpp +++ b/intern/cycles/util/util_task.cpp @@ -62,7 +62,7 @@ void TaskPool::cancel() bool TaskPool::canceled() { - return tbb_group.is_canceling(); + return tbb::is_current_task_group_canceling(); } /* Task Scheduler */ diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h index f2718600f30..7c39ed675b5 100644 --- a/intern/cycles/util/util_task.h +++ b/intern/cycles/util/util_task.h @@ -61,7 +61,7 @@ class TaskPool { void wait_work(Summary *stats = NULL); /* work and wait until all tasks are done */ void cancel(); /* cancel all tasks and wait until they are no longer executing */ - bool canceled(); /* for worker threads, test if canceled */ + static bool canceled(); /* For worker threads, test if current task pool canceled. */ protected: tbb::task_group tbb_group; |