diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-03-26 18:55:08 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-03-26 18:55:08 +0300 |
| commit | ffafe494f62654d2d6de4684bed4a9cb7c2ccb55 (patch) | |
| tree | 1a71a8f9a91b6649c8a2a27dbb05e035de5d9bf4 | |
| parent | 9d25418a52c4aef9210a11a0b4e2739ab6616e94 (diff) | |
Cleanup: Remove double #ifdef WITH_TBB check
| -rw-r--r-- | source/blender/blenlib/BLI_enumerable_thread_specific.hh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/source/blender/blenlib/BLI_enumerable_thread_specific.hh b/source/blender/blenlib/BLI_enumerable_thread_specific.hh index 51bf8d06cf1..a5bd79d5826 100644 --- a/source/blender/blenlib/BLI_enumerable_thread_specific.hh +++ b/source/blender/blenlib/BLI_enumerable_thread_specific.hh @@ -3,23 +3,20 @@ #pragma once #ifdef WITH_TBB - -# ifdef WITH_TBB /* Quiet top level deprecation message, unrelated to API usage here. */ -# if defined(WIN32) && !defined(NOMINMAX) +# 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/enumerable_thread_specific.h> -# ifdef WIN32 +# define NOMINMAX +# define TBB_MIN_MAX_CLEANUP +# endif +# include <tbb/enumerable_thread_specific.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 * were the ones that made the definition earlier. */ -# ifdef TBB_MIN_MAX_CLEANUP -# undef NOMINMAX -# endif +# ifdef TBB_MIN_MAX_CLEANUP +# undef NOMINMAX # endif # endif #endif |