From 559b6e55137b52deb95711c4ff6a1a18fb4ce69e Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Wed, 20 Nov 2024 16:06:10 -0800 Subject: [PATCH] add "`interface`" to `_CCCL_PUSH_MACROS` --- libcudacxx/include/cuda/std/__cccl/diagnostic.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libcudacxx/include/cuda/std/__cccl/diagnostic.h b/libcudacxx/include/cuda/std/__cccl/diagnostic.h index 4183fd96bf7..fdedae215f3 100644 --- a/libcudacxx/include/cuda/std/__cccl/diagnostic.h +++ b/libcudacxx/include/cuda/std/__cccl/diagnostic.h @@ -175,9 +175,12 @@ # define _CCCL_PUSH_MACROS _CCCL_MSVC_WARNINGS_PUSH # define _CCCL_POP_MACROS _CCCL_MSVC_WARNINGS_POP #else // ^^^ _CCCL_HAS_NO_PRAGMA_PUSH_POP_MACRO ^^^ / vvv !_CCCL_HAS_NO_PRAGMA_PUSH_POP_MACRO vvv -# define _CCCL_PUSH_MACROS _CCCL_PRAGMA(push_macro("min")) _CCCL_PRAGMA(push_macro("max")) _CCCL_MSVC_WARNINGS_PUSH -# define _CCCL_POP_MACROS _CCCL_PRAGMA(pop_macro("min")) _CCCL_PRAGMA(pop_macro("max")) _CCCL_MSVC_WARNINGS_POP - +# define _CCCL_PUSH_MACROS \ + _CCCL_PRAGMA(push_macro("min")) \ + _CCCL_PRAGMA(push_macro("max")) _CCCL_PRAGMA(push_macro("interface")) _CCCL_MSVC_WARNINGS_PUSH +# define _CCCL_POP_MACROS \ + _CCCL_PRAGMA(pop_macro("min")) \ + _CCCL_PRAGMA(pop_macro("max")) _CCCL_PRAGMA(pop_macro("interface")) _CCCL_MSVC_WARNINGS_POP #endif // !_CCCL_HAS_NO_PRAGMA_PUSH_POP_MACRO #endif // __CCCL_DIAGNOSTIC_H