From 4adceda8a47e3bc1700dac8b4babeabaa8e46038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Hrn=C4=8D=C3=AD=C5=99?= Date: Mon, 5 Oct 2020 14:34:20 +0200 Subject: [PATCH 1/2] Replace __pragma with _Pragma This change was already merged as #662, but later reverted in #675. Resolves #659 --- 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 dcfd6744b1a..ab9914dfa44 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -485,8 +485,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 @@ -495,7 +495,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 a15ce8d4560c1b52a52900e9baedefc2f63421fe Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 14 May 2021 17:52:04 -0700 Subject: [PATCH 2/2] Work around VSO-1329304 "EDG doesn't understand Standard _Pragma". --- stl/inc/yvals_core.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/stl/inc/yvals_core.h b/stl/inc/yvals_core.h index 7a308d97866..897a0698690 100644 --- a/stl/inc/yvals_core.h +++ b/stl/inc/yvals_core.h @@ -503,20 +503,26 @@ #define _STL_DISABLE_DEPRECATED_WARNING \ _Pragma("clang diagnostic push") \ _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#else // __clang__ +#elif defined(__EDG__) || defined(__CUDACC__) || defined(__INTEL_COMPILER) // TRANSITION, VSO-1329304 +#define _STL_DISABLE_DEPRECATED_WARNING \ + __pragma(warning(push)) \ + __pragma(warning(disable : 4996)) // was declared deprecated +#else // vvv MSVC vvv #define _STL_DISABLE_DEPRECATED_WARNING \ _Pragma("warning(push)") \ _Pragma("warning(disable : 4996)") // was declared deprecated -#endif // __clang__ +#endif // ^^^ MSVC ^^^ #endif // _STL_DISABLE_DEPRECATED_WARNING // clang-format on #ifndef _STL_RESTORE_DEPRECATED_WARNING #ifdef __clang__ #define _STL_RESTORE_DEPRECATED_WARNING _Pragma("clang diagnostic pop") -#else // __clang__ +#elif defined(__EDG__) || defined(__CUDACC__) || defined(__INTEL_COMPILER) // TRANSITION, VSO-1329304 +#define _STL_RESTORE_DEPRECATED_WARNING __pragma(warning(pop)) +#else // vvv MSVC vvv #define _STL_RESTORE_DEPRECATED_WARNING _Pragma("warning(pop)") -#endif // __clang__ +#endif // ^^^ MSVC ^^^ #endif // _STL_RESTORE_DEPRECATED_WARNING #define _CPPLIB_VER 650