From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 17 Jun 2020 03:18:02 +0000 (-0700)
Subject: bpo-19569: Add a macro to suppress deprecation warnings (GH-9004)
X-Git-Tag: v3.9.0b4~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c6d6c12c2d1a8f0c131d70ccf087555c52d4587;p=thirdparty%2FPython%2Fcpython.git

bpo-19569: Add a macro to suppress deprecation warnings (GH-9004)


Co-authored-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
(cherry picked from commit de4304dad8e035dbbb57d653e685312eead816df)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

diff --git a/Include/pyport.h b/Include/pyport.h
index bdbd0c942f68..6505af467683 100644
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -513,6 +513,26 @@ extern "C" {
 #define Py_DEPRECATED(VERSION_UNUSED)
 #endif
 
+#if defined(__clang__)
+#define _Py_COMP_DIAG_PUSH _Pragma("clang diagnostic push")
+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
+    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#define _Py_COMP_DIAG_POP _Pragma("clang diagnostic pop")
+#elif defined(__GNUC__) \
+    && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
+#define _Py_COMP_DIAG_PUSH _Pragma("GCC diagnostic push")
+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \
+    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#define _Py_COMP_DIAG_POP _Pragma("GCC diagnostic pop")
+#elif defined(_MSC_VER)
+#define _Py_COMP_DIAG_PUSH __pragma(warning(push))
+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS __pragma(warning(disable: 4996))
+#define _Py_COMP_DIAG_POP __pragma(warning(pop))
+#else
+#define _Py_COMP_DIAG_PUSH
+#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS
+#define _Py_COMP_DIAG_POP
+#endif
 
 /* _Py_HOT_FUNCTION
  * The hot attribute on a function is used to inform the compiler that the
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-08-29-15-57-07.bpo-19569.RGu2Kb.rst b/Misc/NEWS.d/next/Core and Builtins/2018-08-29-15-57-07.bpo-19569.RGu2Kb.rst
new file mode 100644
index 000000000000..1b76bd8e247f
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-08-29-15-57-07.bpo-19569.RGu2Kb.rst	
@@ -0,0 +1,2 @@
+Add the private macros ``_Py_COMP_DIAG_PUSH``,
+``_Py_COMP_DIAG_IGNORE_DEPR_DECLS``, and ``_Py_COMP_DIAG_POP``.