From 2c2dc29b99a3d1765e4d47d89a59df4ffbab4ce1 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 2 Apr 2020 12:41:30 -0700 Subject: [PATCH] Revert "Replace __pragma with _Pragma (#662)" This reverts commit 42d5df07d025f1e635ee16f45b6c688394634947. Reverting due to a bug in how /Zc:preprocessor handles _Pragma see VSO-1091758 for more details --- stl/inc/yvals_core.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index 047887ea7c5..af1374deddf 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -455,8 +455,8 @@ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") #else // __clang__ #define _STL_DISABLE_DEPRECATED_WARNING \ - _Pragma("warning(push)") \ - _Pragma("warning(disable : 4996)") // was declared deprecated + __pragma(warning(push)) \ + __pragma(warning(disable : 4996)) // was declared deprecated #endif // __clang__ #endif // _STL_DISABLE_DEPRECATED_WARNING // clang-format on @@ -465,7 +465,7 @@ #ifdef __clang__ #define _STL_RESTORE_DEPRECATED_WARNING _Pragma("clang diagnostic pop") #else // __clang__ -#define _STL_RESTORE_DEPRECATED_WARNING _Pragma("warning(pop)") +#define _STL_RESTORE_DEPRECATED_WARNING __pragma(warning(pop)) #endif // __clang__ #endif // _STL_RESTORE_DEPRECATED_WARNING