From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- source/blender/blenlib/BLI_array_utils.h | 81 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 40 deletions(-) (limited to 'source/blender/blenlib/BLI_array_utils.h') diff --git a/source/blender/blenlib/BLI_array_utils.h b/source/blender/blenlib/BLI_array_utils.h index 9ab2c439cc7..4ceb149f238 100644 --- a/source/blender/blenlib/BLI_array_utils.h +++ b/source/blender/blenlib/BLI_array_utils.h @@ -25,63 +25,64 @@ #include "BLI_compiler_typecheck.h" void _bli_array_reverse(void *arr, unsigned int arr_len, size_t arr_stride); -#define BLI_array_reverse(arr, arr_len) \ - _bli_array_reverse(arr, arr_len, sizeof(*(arr))) +#define BLI_array_reverse(arr, arr_len) _bli_array_reverse(arr, arr_len, sizeof(*(arr))) void _bli_array_wrap(void *arr, unsigned int arr_len, size_t arr_stride, int dir); -#define BLI_array_wrap(arr, arr_len, dir) \ - _bli_array_wrap(arr, arr_len, sizeof(*(arr)), dir) +#define BLI_array_wrap(arr, arr_len, dir) _bli_array_wrap(arr, arr_len, sizeof(*(arr)), dir) -void _bli_array_permute( - void *arr, const unsigned int arr_len, const size_t arr_stride, - const unsigned int *index, void *arr_temp); +void _bli_array_permute(void *arr, + const unsigned int arr_len, + const size_t arr_stride, + const unsigned int *index, + void *arr_temp); #define BLI_array_permute(arr, arr_len, order) \ - _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, NULL) + _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, NULL) #define BLI_array_permute_ex(arr, arr_len, order, arr_temp) \ - _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, arr_temp) + _bli_array_permute(arr, arr_len, sizeof(*(arr)), order, arr_temp) int _bli_array_findindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p); -#define BLI_array_findindex(arr, arr_len, p) \ - _bli_array_findindex(arr, arr_len, sizeof(*(arr)), p) +#define BLI_array_findindex(arr, arr_len, p) _bli_array_findindex(arr, arr_len, sizeof(*(arr)), p) int _bli_array_rfindindex(const void *arr, unsigned int arr_len, size_t arr_stride, const void *p); #define BLI_array_rfindindex(arr, arr_len, p) \ - _bli_array_rfindindex(arr, arr_len, sizeof(*(arr)), p) + _bli_array_rfindindex(arr, arr_len, sizeof(*(arr)), p) void _bli_array_binary_and( - void *arr, const void *arr_a, const void *arr_b, - unsigned int arr_len, size_t arr_stride); + void *arr, const void *arr_a, const void *arr_b, unsigned int arr_len, size_t arr_stride); #define BLI_array_binary_and(arr, arr_a, arr_b, arr_len) \ - (CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_a)), \ - CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_b)), \ - _bli_array_binary_and(arr, arr_a, arr_b, arr_len, sizeof(*(arr)))) + (CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_a)), \ + CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_b)), \ + _bli_array_binary_and(arr, arr_a, arr_b, arr_len, sizeof(*(arr)))) void _bli_array_binary_or( - void *arr, const void *arr_a, const void *arr_b, - unsigned int arr_len, size_t arr_stride); + void *arr, const void *arr_a, const void *arr_b, unsigned int arr_len, size_t arr_stride); #define BLI_array_binary_or(arr, arr_a, arr_b, arr_len) \ - (CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_a)), \ - CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_b)), \ - _bli_array_binary_or(arr, arr_a, arr_b, arr_len, sizeof(*(arr)))) + (CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_a)), \ + CHECK_TYPE_PAIR_INLINE(*(arr), *(arr_b)), \ + _bli_array_binary_or(arr, arr_a, arr_b, arr_len, sizeof(*(arr)))) -bool _bli_array_iter_span( - const void *arr, - unsigned int arr_len, size_t arr_stride, - bool use_wrap, bool use_delimit_bounds, - bool (*test_fn)(const void *arr_item, void *user_data), void *user_data, - unsigned int span_step[2], unsigned int *r_span_len); +bool _bli_array_iter_span(const void *arr, + unsigned int arr_len, + size_t arr_stride, + bool use_wrap, + bool use_delimit_bounds, + bool (*test_fn)(const void *arr_item, void *user_data), + void *user_data, + unsigned int span_step[2], + unsigned int *r_span_len); #define BLI_array_iter_span( \ - arr, arr_len, use_wrap, use_delimit_bounds, test_fn, user_data, \ - span_step, r_span_len) \ - _bli_array_iter_span( \ - arr, arr_len, sizeof(*(arr)), use_wrap, use_delimit_bounds, test_fn, user_data, \ - span_step, r_span_len) + arr, arr_len, use_wrap, use_delimit_bounds, test_fn, user_data, span_step, r_span_len) \ + _bli_array_iter_span(arr, \ + arr_len, \ + sizeof(*(arr)), \ + use_wrap, \ + use_delimit_bounds, \ + test_fn, \ + user_data, \ + span_step, \ + r_span_len) -bool _bli_array_is_zeroed( - const void *arr, - unsigned int arr_len, size_t arr_stride); -#define BLI_array_is_zeroed(arr, arr_len) \ - _bli_array_is_zeroed( \ - arr, arr_len, sizeof(*(arr))) +bool _bli_array_is_zeroed(const void *arr, unsigned int arr_len, size_t arr_stride); +#define BLI_array_is_zeroed(arr, arr_len) _bli_array_is_zeroed(arr, arr_len, sizeof(*(arr))) -#endif /* __BLI_ARRAY_UTILS_H__ */ +#endif /* __BLI_ARRAY_UTILS_H__ */ -- cgit v1.2.3