diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-15 15:51:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-15 16:03:51 +0300 |
| commit | f0c991a380e9d449ebc02cc91649ef3728848070 (patch) | |
| tree | 52b32ea8839229ddbcf1eb9c6c7ada30bed17804 /intern/cycles/util | |
| parent | 924fe50e97cd4cc130d96f0c4f23664052c31458 (diff) | |
Cleanup: work around clang-format differences between versions
Ref T73747
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_defines.h | 5 | ||||
| -rw-r--r-- | intern/cycles/util/util_static_assert.h | 28 |
2 files changed, 12 insertions, 21 deletions
diff --git a/intern/cycles/util/util_defines.h b/intern/cycles/util/util_defines.h index b29d4163133..24a20a969ab 100644 --- a/intern/cycles/util/util_defines.h +++ b/intern/cycles/util/util_defines.h @@ -15,6 +15,11 @@ * limitations under the License. */ +/* clang-format off */ + +/* #define __forceinline triggers a bug in some clang-format versions, disable + * format for entire file to keep results consistent. */ + #ifndef __UTIL_DEFINES_H__ #define __UTIL_DEFINES_H__ diff --git a/intern/cycles/util/util_static_assert.h b/intern/cycles/util/util_static_assert.h index ceb52830319..7d458bed14e 100644 --- a/intern/cycles/util/util_static_assert.h +++ b/intern/cycles/util/util_static_assert.h @@ -14,34 +14,20 @@ * limitations under the License. */ +/* clang-format off */ + +/* #define static_assert triggers a bug in some clang-format versions, disable + * format for entire file to keep results consistent. */ + #ifndef __UTIL_STATIC_ASSERT_H__ #define __UTIL_STATIC_ASSERT_H__ CCL_NAMESPACE_BEGIN -/* TODO(sergey): In theory CUDA might work with own static assert - * implementation since it's just pure C++. - */ -#ifdef __KERNEL_GPU__ -# ifndef static_assert -# define static_assert(statement, message) -# endif +#ifdef __KERNEL_OPECL__ +# define static_assert(statement, message) #endif /* __KERNEL_GPU__ */ -/* TODO(sergey): For until C++11 is a bare minimum for us, - * we do a bit of a trickery to show meaningful message so - * it's more or less clear what's wrong when building without - * C++11. - * - * The thing here is: our non-C++11 implementation doesn't - * have a way to print any message after preprocessor - * substitution so we rely on the message which is passed to - * static_assert() since that's the only message visible when - * compilation fails. - * - * After C++11 bump it should be possible to glue structure - * name to the error message, - */ #define static_assert_align(st, align) \ static_assert((sizeof(st) % (align) == 0), "Structure must be strictly aligned") // NOLINT |