Merge branch 'fix-cccl-requires-expr-macro' into cudax-any-resource-r…

…edux
NVIDIA · Dec 13, 2024 · 452c16d · 452c16d
2 parents d479a5f + ec5078c
commit 452c16d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/libcudacxx/include/cuda/std/__cccl/preprocessor.h b/libcudacxx/include/cuda/std/__cccl/preprocessor.h
@@ -28,6 +28,12 @@
 #  define _CCCL_HAS_INCLUDE(_X) 0
 #endif
 
+#ifdef __COUNTER__
+#  define _CCCL_COUNTER() __COUNTER__
+#else
+#  define _CCCL_COUNTER() __LINE__
+#endif
+
 #define _CCCL_PP_EXPAND(...) __VA_ARGS__
 #define _CCCL_PP_EAT(...)
 

diff --git a/libcudacxx/include/cuda/std/__concepts/concept_macros.h b/libcudacxx/include/cuda/std/__concepts/concept_macros.h
@@ -244,12 +244,12 @@ namespace __cccl_unqualified_cuda_std = _CUDA_VSTD; // NOLINT(misc-unused-alias-
 
 #    define _CCCL_REQUIRES_EXPR(_TY, ...)                                                                             \
       ::__cccl_requires_expr_impl<                                                                                    \
-        struct _CCCL_PP_CAT(__cccl_requires_expr_detail_, __LINE__) _CCCL_REQUIRES_EXPR_EXPAND_TPARAMS                \
+        struct _CCCL_PP_CAT(__cccl_requires_expr_detail_, _CCCL_COUNTER()) _CCCL_REQUIRES_EXPR_EXPAND_TPARAMS         \
           _TY>::__cccl_is_satisfied(static_cast<::__cccl_tag<void _CCCL_REQUIRES_EXPR_EXPAND_TPARAMS _TY>*>(nullptr), \
                                     static_cast<void (*)(__VA_ARGS__)>(nullptr));                                     \
-      struct _CCCL_PP_CAT(__cccl_requires_expr_detail_, __LINE__)                                                     \
+      struct _CCCL_PP_CAT(__cccl_requires_expr_detail_, _CCCL_COUNTER())                                              \
       {                                                                                                               \
-        using __cccl_self_t = _CCCL_PP_CAT(__cccl_requires_expr_detail_, __LINE__);                                   \
+        using __cccl_self_t = _CCCL_PP_CAT(__cccl_requires_expr_detail_, _CCCL_COUNTER());                            \
         template <class _CCCL_REQUIRES_EXPR_TPARAMS _TY>                                                              \
         _LIBCUDACXX_HIDE_FROM_ABI static auto __cccl_well_formed(__VA_ARGS__) _CCCL_REQUIRES_EXPR_2