diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 13:04:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-23 13:16:17 +0300 |
| commit | b9513706cb57290f5b7ecf085d933c832d622fa7 (patch) | |
| tree | 80b00b16dff611b51724e452714acddde4d5db49 /source/blender/blenlib | |
| parent | 37cfa44222a6bdb92c825e614404a1c7e6bb97f8 (diff) | |
Cleanup: mark VA_NARGS_COUNT as public
Was already used in two other headers, remove underscore prefix.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_string_utils.h | 6 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_variadic_defines.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h index e913ec3a15b..63c1e0344ad 100644 --- a/source/blender/blenlib/BLI_string_utils.h +++ b/source/blender/blenlib/BLI_string_utils.h @@ -60,13 +60,13 @@ char *BLI_string_join_array_by_sep_char_with_tableN( /* Take multiple arguments, pass as (array, length). */ #define BLI_string_joinN(...) \ BLI_string_join_arrayN( \ - ((const char *[]){__VA_ARGS__}), _VA_NARGS_COUNT(__VA_ARGS__)) + ((const char *[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__)) #define BLI_string_join_by_sep_charN(sep, ...) \ BLI_string_join_array_by_sep_charN( \ - sep, ((const char *[]){__VA_ARGS__}), _VA_NARGS_COUNT(__VA_ARGS__)) + sep, ((const char *[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__)) #define BLI_string_join_by_sep_char_with_tableN(sep, table, ...) \ BLI_string_join_array_by_sep_char_with_tableN( \ - sep, table, ((const char *[]){__VA_ARGS__}), _VA_NARGS_COUNT(__VA_ARGS__)) + sep, table, ((const char *[]){__VA_ARGS__}), VA_NARGS_COUNT(__VA_ARGS__)) void BLI_string_flip_side_name(char *r_name, const char *from_name, const bool strip_number, const size_t name_len); diff --git a/source/blender/blenlib/BLI_variadic_defines.h b/source/blender/blenlib/BLI_variadic_defines.h index df26f428f68..a2ff8ee09e7 100644 --- a/source/blender/blenlib/BLI_variadic_defines.h +++ b/source/blender/blenlib/BLI_variadic_defines.h @@ -39,12 +39,12 @@ #define _VA_NARGS_OVERLOAD_MACRO(name, count) _VA_NARGS_OVERLOAD_MACRO1(name, count) /* --- expose for re-use --- */ /* 64 args max */ -#define _VA_NARGS_COUNT(...) _VA_NARGS_EXPAND((__VA_ARGS__, \ +#define VA_NARGS_COUNT(...) _VA_NARGS_EXPAND((__VA_ARGS__, \ 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, \ 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, \ 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, \ 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)) #define VA_NARGS_CALL_OVERLOAD(name, ...) \ - _VA_NARGS_GLUE(_VA_NARGS_OVERLOAD_MACRO(name, _VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__)) + _VA_NARGS_GLUE(_VA_NARGS_OVERLOAD_MACRO(name, VA_NARGS_COUNT(__VA_ARGS__)), (__VA_ARGS__)) #endif /* __BLI_VARIADIC_DEFINES_H__ */ |