From: Barry Warsaw <barry@python.org>
Date: Mon, 5 Dec 2011 21:45:02 +0000 (-0500)
Subject: - Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER.  (Fix
X-Git-Tag: v3.2.3rc1~309
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f5713546503628d4af0895eb76f1368160853be;p=python

- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER.  (Fix
  given by Campbell Barton).
---

diff --git a/Include/pyatomic.h b/Include/pyatomic.h
index da45327b89..d4e19e0070 100644
--- a/Include/pyatomic.h
+++ b/Include/pyatomic.h
@@ -58,6 +58,7 @@ _Py_atomic_thread_fence(_Py_memory_order order)
 static __inline__ void
 _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
 {
+    (void)address;		/* shut up -Wunused-parameter */
     switch(order) {
     case _Py_memory_order_release:
     case _Py_memory_order_acq_rel:
diff --git a/Misc/NEWS b/Misc/NEWS
index c5324644d4..e65e8054b4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.3?
 Core and Builtins
 -----------------
 
+- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER.  (Fix
+  given by Campbell Barton).
+
 - Issue #7111: Python can now be run without a stdin, stdout or stderr
   stream.  It was already the case with Python 2.  However, the corresponding
   sys module entries are now set to None (instead of an unusable file object).