Fix T56197: Cycles OpenCL build error after recent changes.

2018-08-01 19:31:27 +02:00
parent 9336aef4eb
commit e50a3dd4c4
1 changed files with 5 additions and 1 deletions
--- 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<typename T> 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: