diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-02 10:52:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-02 10:52:22 +0300 |
| commit | d3c387d605470838e8f8349fa37c4b123e3e0471 (patch) | |
| tree | 3a098583b4c7888146021c19bf9bca19594e903b /intern | |
| parent | 503866c68154ef09e6199068391515f81eebaa2d (diff) | |
| parent | cb6d7cb0b255b9018620c4b11da8ed0044b1288f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_defines.h | 6 |
1 files changed, 5 insertions, 1 deletions
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: |