[Bf-blender-cvs] [e50a3dd4c4e] master: Fix T56197: Cycles OpenCL build error after recent changes.
Brecht Van Lommel
noreply at git.blender.org
Wed Aug 1 19:45:14 CEST 2018
Commit: e50a3dd4c4e9a9898df31e444d1002770b4efb9c
Author: Brecht Van Lommel
Date: Wed Aug 1 19:31:27 2018 +0200
Branches: master
https://developer.blender.org/rBe50a3dd4c4e9a9898df31e444d1002770b4efb9c
Fix T56197: Cycles OpenCL build error after recent changes.
===================================================================
M intern/cycles/util/util_defines.h
===================================================================
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<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:
More information about the Bf-blender-cvs
mailing list