From d7960f471eea0100d9cb6c72f45035ea8c5403f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Hrn=C4=8D=C3=AD=C5=99?= Date: Tue, 31 Mar 2020 13:47:46 +0200 Subject: [PATCH 1/3] Replace __pragma with _Pragma VS 2019 16.6 Preview 2 now supports Standard _Pragma. --- 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 df4c26e2ffc..092d4675dd6 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -453,8 +453,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 @@ -463,7 +463,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 From 2ead6f232ff902f72f65d7284d4ac70162b46567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Hrn=C4=8D=C3=AD=C5=99?= Date: Tue, 31 Mar 2020 14:25:41 +0200 Subject: [PATCH 2/3] Fix formatting --- stl/inc/yvals_core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index 092d4675dd6..01c3c6ec6ca 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -453,7 +453,7 @@ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") #else // __clang__ #define _STL_DISABLE_DEPRECATED_WARNING \ - _Pragma(warning(push)) \ + _Pragma(warning(push)) \ _Pragma(warning(disable : 4996)) // was declared deprecated #endif // __clang__ #endif // _STL_DISABLE_DEPRECATED_WARNING From 5de89577b1bf189a70cb15d5148154393153e6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Hrn=C4=8D=C3=AD=C5=99?= Date: Tue, 31 Mar 2020 15:29:18 +0200 Subject: [PATCH 3/3] _Pragma takes a string --- 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 01c3c6ec6ca..b9a45759b7d 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -453,8 +453,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 @@ -463,7 +463,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