diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 19:38:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-30 19:44:18 +0300 |
| commit | 2e2e7aff7cb28337684534d2207816946407788b (patch) | |
| tree | 14da1dfc59a2638b28cd12aeea70698e89c97235 /source/blender/blenlib | |
| parent | cc397b918ff1b2a51b3b82367506eb7684860cea (diff) | |
| parent | 885cc4cf9a1d5c167e4cbd26c3294d8b1ad400d8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_compiler_compat.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_compiler_compat.h b/source/blender/blenlib/BLI_compiler_compat.h index 0726e3bb343..2b53975a106 100644 --- a/source/blender/blenlib/BLI_compiler_compat.h +++ b/source/blender/blenlib/BLI_compiler_compat.h @@ -32,11 +32,7 @@ # define alloca _alloca #endif -#if defined(__cplusplus) && ((__cplusplus >= 201103L) || defined(_MSC_VER)) -# define HAS_CPP11_FEATURES -#endif - -#if (defined(__GNUC__) || defined(__clang__)) && defined(HAS_CPP11_FEATURES) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__cplusplus) extern "C++" { /* 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; } |