Skip to content

Commit 8768676

Browse files
Fix use of EXPAND in token concatenation (#8076) (#8077)
We missed that in #6366 (cherry picked from commit 906c225) Co-authored-by: Michael Schellenberger Costa <miscco@nvidia.com>
1 parent 5617acb commit 8768676

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

libcudacxx/include/cuda/std/__concepts/concept_macros.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,13 @@ namespace __cccl_unqualified_cuda_std = ::cuda::std; // NOLINT(misc-unused-alias
188188
#define _CCCL_CONCEPT_EAT_SATISFIES_(...) _CCCL_PP_CAT(_CCCL_CONCEPT_EAT_SATISFIES_, __VA_ARGS__)
189189
#define _CCCL_CONCEPT_EAT_SATISFIES__Satisfies(...)
190190

191-
// Converts "_Satisfies(TYPE) EXPR..." to "TYPE" (The ridiculous concatenation of _CCCL_PP_
192-
// with EXPAND(__VA_ARGS__) is the only way to get MSVC's broken preprocessor to do macro
191+
// Converts "_Satisfies(TYPE) EXPR..." to "TYPE" (The ridiculous concatenation of _CCCL
192+
// with _PP_EXPAND(__VA_ARGS__) is the only way to get MSVC's broken preprocessor to do macro
193193
// expansion here.)
194194
#define _CCCL_CONCEPT_GET_CONCEPT_FROM_SATISFIES_(...) \
195-
_CCCL_PP_CAT(_CCCL_PP_, \
195+
_CCCL_PP_CAT(_CCCL, \
196196
_CCCL_PP_EVAL(_CCCL_PP_FIRST, _CCCL_PP_CAT(_CCCL_CONCEPT_GET_CONCEPT_FROM_SATISFIES_, __VA_ARGS__)))
197-
#define _CCCL_CONCEPT_GET_CONCEPT_FROM_SATISFIES__Satisfies(...) EXPAND(__VA_ARGS__),
197+
#define _CCCL_CONCEPT_GET_CONCEPT_FROM_SATISFIES__Satisfies(...) _PP_EXPAND(__VA_ARGS__),
198198

199199
// Here are the implementations of the internal macros, first for when concepts
200200
// are available, and then for when they're not.

0 commit comments

Comments
 (0)