From 3c23a5e0a9f94cef21262c861564ef8ae60d9d0d Mon Sep 17 00:00:00 2001 From: Jo Bates Date: Sat, 17 Jun 2023 10:14:41 -0700 Subject: [PATCH] When Clang defines _MSC_VER, prefer Clang versions of attribute macros --- include/cpp2util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/cpp2util.h b/include/cpp2util.h index b5d18a4b2f..4e2323e236 100644 --- a/include/cpp2util.h +++ b/include/cpp2util.h @@ -681,7 +681,7 @@ class out { // //----------------------------------------------------------------------- // -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang_major__) #define CPP2_FORCE_INLINE __forceinline #define CPP2_FORCE_INLINE_LAMBDA [[msvc::forceinline]] #define CPP2_LAMBDA_NO_DISCARD