From ffafe494f62654d2d6de4684bed4a9cb7c2ccb55 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Sat, 26 Mar 2022 09:55:08 -0600 Subject: Cleanup: Remove double #ifdef WITH_TBB check --- .../blender/blenlib/BLI_enumerable_thread_specific.hh | 19 ++++++++----------- 1 file 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 -# ifdef WIN32 +# define NOMINMAX +# define TBB_MIN_MAX_CLEANUP +# endif +# include +# 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 -- cgit v1.2.3