@@ -323,17 +323,21 @@ namespace __cccl_unqualified_cuda_std = ::cuda::std; // NOLINT(misc-unused-alias
323323# if defined(__COUNTER__)
324324# define _CCCL_REQUIRES_EXPR_ID (...) __COUNTER__
325325# else // ^^^ __COUNTER__ ^^^ / vvv !__COUNTER__ vvv
326- # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM (_TY ) , _CCCL_PP_SWITCH2(_CCCL_REQUIRES_EXPR_ID_TRANSFORM, _TY)
327- # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM_SWITCH_variadic _CCCL_PP_CASE (VARIADIC)
328- # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM_CASE_DEFAULT (_TY ) _##_TY
329- # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM_CASE_VARIADIC (_TY ) _CCCL_PP_CAT(_, _CCCL_PP_CAT(_CCCL_REQUIRES_EXPR_EAT_VARIADIC_, _TY))
330-
331- # define _CCCL_REQUIRES_EXPR_ID_CONCAT_ALL_IMPL (_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, ...) \
332- _0##_1##_2##_3##_4##_5##_6##_7##_8##_9##_10##_11##_12##_13##_14##_15##_16
333- # define _CCCL_REQUIRES_EXPR_ID_CONCAT_ALL (...) _CCCL_PP_EVAL(_CCCL_REQUIRES_EXPR_ID_CONCAT_ALL_IMPL, __VA_ARGS__, , , , , , , , , , , , , , , , ,)
326+ # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM (_TY ) , _CCCL_PP_SWITCH2(_CCCL_REQUIRES_EXPR_ID_TRANSFORM, _TY)
327+ # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM_SWITCH_variadic _CCCL_PP_CASE (VARIADIC)
328+ # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM_CASE_DEFAULT (_TY ) _##_TY
329+ # define _CCCL_REQUIRES_EXPR_ID_TRANSFORM_CASE_VARIADIC (_TY ) \
330+ _CCCL_PP_CAT (_, _CCCL_PP_CAT (_CCCL_REQUIRES_EXPR_EAT_VARIADIC_, _TY))
331+
332+ # define _CCCL_REQUIRES_EXPR_ID_CONCAT_ALL_IMPL ( \
333+ _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, ...) \
334+ _0##_1##_2##_3##_4##_5##_6##_7##_8##_9##_10##_11##_12##_13##_14##_15##_16
335+ # define _CCCL_REQUIRES_EXPR_ID_CONCAT_ALL (...) \
336+ _CCCL_PP_EVAL (_CCCL_REQUIRES_EXPR_ID_CONCAT_ALL_IMPL, __VA_ARGS__, , , , , , , , , , , , , , , , , )
334337
335338// Expands to [line]_Arg1_Arg2_..._ArgN, maximum 16 arguments
336- # define _CCCL_REQUIRES_EXPR_ID (...) _CCCL_REQUIRES_EXPR_ID_CONCAT_ALL(__LINE__, _CCCL_PP_FOR_EACH(_CCCL_REQUIRES_EXPR_ID_TRANSFORM, __VA_ARGS__))
339+ # define _CCCL_REQUIRES_EXPR_ID (...) \
340+ _CCCL_REQUIRES_EXPR_ID_CONCAT_ALL (__LINE__, _CCCL_PP_FOR_EACH (_CCCL_REQUIRES_EXPR_ID_TRANSFORM, __VA_ARGS__))
337341# endif // ^^^ !__COUNTER__ ^^^
338342
339343# define _CCCL_REQUIRES_EXPR_EAT_VARIADIC_variadic
0 commit comments