diff options
| author | Brecht Van Lommel <brecht> | 2021-02-10 20:17:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-10 21:32:24 +0300 |
| commit | 677e63d51869bb89f2ca1adee2e8350ed379005d (patch) | |
| tree | 70509efd6a2620f6dbebfd5e3f169a0bfe87e4d3 /intern | |
| parent | 69c7ffff8bbdaa585b51fe3e4e36a7f37b5759b7 (diff) | |
TBB: fix deprecation warnings with newer TBB versions
* USD and OpenVDB headers use deprecated TBB headers, suppress all deprecation
warnings there since we have no control over them.
* For our own TBB includes, use the individual headers rather than the tbb.h that
includes everything to avoid warnings, rather than suppressing all.
This is in anticipation of the TBB 2020 upgrade in D10359. Ref D10361.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_tbb.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/util/util_tbb.h b/intern/cycles/util/util_tbb.h index 168bd5db961..73e0f92d19c 100644 --- a/intern/cycles/util/util_tbb.h +++ b/intern/cycles/util/util_tbb.h @@ -21,11 +21,14 @@ * WIN32_LEAN_AND_MEAN and similar are defined beforehand. */ #include "util_windows.h" -#define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 -#include <tbb/tbb.h> +#include <tbb/enumerable_thread_specific.h> +#include <tbb/parallel_for.h> +#include <tbb/task_arena.h> +#include <tbb/task_group.h> #if TBB_INTERFACE_VERSION_MAJOR >= 10 # define WITH_TBB_GLOBAL_CONTROL +# include <tbb/global_control.h> #endif CCL_NAMESPACE_BEGIN |