[Python-checkins] cpython (merge 3.2 -> default): - Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix

[barry.warsaw]

http://hg.python.org/cpython/rev/6b6c79eba944
changeset:   73867:6b6c79eba944
parent:      73865:e2959a6a1440
parent:      73866:4579cd952156
user:        Barry Warsaw <barry at python.org>
date:        Mon Dec 05 16:50:41 2011 -0500
summary:
  - Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER.  (Fix
  given by Campbell Barton).

files:
  Include/pyatomic.h |  1 +
  Misc/NEWS          |  3 +++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Include/pyatomic.h b/Include/pyatomic.h
--- a/Include/pyatomic.h
+++ b/Include/pyatomic.h
@@ -58,6 +58,7 @@
 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER.  (Fix
+  given by Campbell Barton).
+
 - Issue #13503: Use a more efficient reduction format for bytearrays with
   pickle protocol >= 3.  The old reduction format is kept with older protocols
   in order to allow unpickling under Python 2.  Patch by Irmen de Jong.

-- 
Repository URL: http://hg.python.org/cpython