diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-06 16:16:45 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-06 16:18:26 +0300 |
| commit | 0e995e0bfe51614e1a3ed75e8e80fa194a38d4aa (patch) | |
| tree | edf003f651e017f1e63015c925286469c45b8c02 /intern/cycles/util/util_ssef.h | |
| parent | b498db06eb43f1e036f16cb346bf4cbb6d20e6d5 (diff) | |
Cycles: Fix strict -Wpedantic warnings with GCC
Patch by Stefan Werner, thanks!
Diffstat (limited to 'intern/cycles/util/util_ssef.h')
| -rw-r--r-- | intern/cycles/util/util_ssef.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/util/util_ssef.h b/intern/cycles/util/util_ssef.h index 2f5295b5463..cf99a08efae 100644 --- a/intern/cycles/util/util_ssef.h +++ b/intern/cycles/util/util_ssef.h @@ -514,12 +514,12 @@ ccl_device_inline float len3(const ssef& a) /* faster version for SSSE3 */ typedef ssei shuffle_swap_t; -ccl_device_inline const shuffle_swap_t shuffle_swap_identity(void) +ccl_device_inline shuffle_swap_t shuffle_swap_identity(void) { return _mm_set_epi8(15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0); } -ccl_device_inline const shuffle_swap_t shuffle_swap_swap(void) +ccl_device_inline shuffle_swap_t shuffle_swap_swap(void) { return _mm_set_epi8(7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8); } @@ -534,12 +534,12 @@ ccl_device_inline const ssef shuffle_swap(const ssef& a, const shuffle_swap_t& s /* somewhat slower version for SSE2 */ typedef int shuffle_swap_t; -ccl_device_inline const shuffle_swap_t shuffle_swap_identity(void) +ccl_device_inline shuffle_swap_t shuffle_swap_identity(void) { return 0; } -ccl_device_inline const shuffle_swap_t shuffle_swap_swap(void) +ccl_device_inline shuffle_swap_t shuffle_swap_swap(void) { return 1; } |