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/BLI_task.hh | |
| 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/BLI_task.hh')
| -rw-r--r-- | source/blender/blenlib/BLI_task.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_task.hh b/source/blender/blenlib/BLI_task.hh index 0da03d84793..8e963c958b2 100644 --- a/source/blender/blenlib/BLI_task.hh +++ b/source/blender/blenlib/BLI_task.hh @@ -22,15 +22,15 @@ #ifdef WITH_TBB /* Quiet top level deprecation message, unrelated to API usage here. */ -# define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 - # if defined(WIN32) && !defined(NOMINMAX) /* TBB includes Windows.h which will define min/max macros causing issues * when we try to use std::min and std::max later on. */ # define NOMINMAX # define TBB_MIN_MAX_CLEANUP # endif -# include <tbb/tbb.h> +# include <tbb/blocked_range.h> +# include <tbb/parallel_for.h> +# include <tbb/parallel_for_each.h> # ifdef WIN32 /* We cannot keep this defined, since other parts of the code deal with this on their own, leading * to multiple define warnings unless we un-define this, however we can only undefine this if we |