From e50a3dd4c4e9a9898df31e444d1002770b4efb9c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 1 Aug 2018 19:31:27 +0200 Subject: Fix T56197: Cycles OpenCL build error after recent changes. --- intern/cycles/util/util_defines.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'intern/cycles/util') diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h index 1a09f659eb1..8bce4aca699 100644 --- a/intern/cycles/util/util_defines.h +++ b/intern/cycles/util/util_defines.h @@ -88,9 +88,13 @@ #endif #if defined(__GNUC__) || defined(__clang__) +# if defined(__cplusplus) /* Some magic to be sure we don't have reference in the type. */ template static inline T decltype_helper(T x) { return x; } -# define TYPEOF(x) decltype(decltype_helper(x)) +# define TYPEOF(x) decltype(decltype_helper(x)) +# else +# define TYPEOF(x) typeof(x) +# endif #endif /* Causes warning: -- cgit v1.2.3