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 /source/blender/blenlib/intern/task_pool.cc | |
| 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 'source/blender/blenlib/intern/task_pool.cc')
| -rw-r--r-- | source/blender/blenlib/intern/task_pool.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc index 10f15f8749c..00ba659a9c8 100644 --- a/source/blender/blenlib/intern/task_pool.cc +++ b/source/blender/blenlib/intern/task_pool.cc @@ -34,9 +34,9 @@ #include "BLI_threads.h" #ifdef WITH_TBB -/* Quiet top level deprecation message, unrelated to API usage here. */ -# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 -# include <tbb/tbb.h> +# include <tbb/blocked_range.h> +# include <tbb/task_arena.h> +# include <tbb/task_group.h> #endif /* Task |