diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-08-19 22:02:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-19 22:02:02 +0300 |
commit | 6b9209ddfab375c55b73c11ac798b76345b822a0 (patch) | |
tree | 08aa1760f2aebe814f4c11e04d3b1f5141800c13 /intern/cycles/util/defines.h | |
parent | 6ef4267d5ef6fe91069c1ce1a131f49534eeb516 (diff) | |
parent | 51b79e4775e1f661df9aac60b7d355b72aa8b748 (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'intern/cycles/util/defines.h')
-rw-r--r-- | intern/cycles/util/defines.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/intern/cycles/util/defines.h b/intern/cycles/util/defines.h index c7118ca09c9..1969529eff0 100644 --- a/intern/cycles/util/defines.h +++ b/intern/cycles/util/defines.h @@ -89,46 +89,6 @@ # define UNLIKELY(x) (x) #endif -#if defined(__GNUC__) || defined(__clang__) -# if defined(__cplusplus) -/* Some magic to be sure we don't have reference in the type. */ -template<typename T> static inline T decltype_helper(T x) -{ - return x; -} -# define TYPEOF(x) decltype(decltype_helper(x)) -# else -# define TYPEOF(x) typeof(x) -# endif -#endif - -/* Causes warning: - * incompatible types when assigning to type 'Foo' from type 'Bar' - * ... the compiler optimizes away the temp var */ -#ifdef __GNUC__ -# define CHECK_TYPE(var, type) \ - { \ - TYPEOF(var) * __tmp; \ - __tmp = (type *)NULL; \ - (void)__tmp; \ - } \ - (void)0 - -# define CHECK_TYPE_PAIR(var_a, var_b) \ - { \ - TYPEOF(var_a) * __tmp; \ - __tmp = (typeof(var_b) *)NULL; \ - (void)__tmp; \ - } \ - (void)0 -#else -# define CHECK_TYPE(var, type) -# define CHECK_TYPE_PAIR(var_a, var_b) -#endif - -/* can be used in simple macros */ -#define CHECK_TYPE_INLINE(val, type) ((void)(((type)0) != (val))) - #ifndef __KERNEL_GPU__ # include <cassert> # define util_assert(statement) assert(statement) |