summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-12-05 21:50:41 (GMT)
committerBarry Warsaw <barry@python.org>2011-12-05 21:50:41 (GMT)
commit04f6974d84e8054e0aafe5bceef8d5dca14a65d5 (patch)
tree67294af8ec282c6ff09eb58e3e2079e5c457fe5e
parentb0e1f8b38bbbb80cd83ed15dde8cbad141296ae1 (diff)
parent9f5713546503628d4af0895eb76f1368160853be (diff)
downloadcpython-04f6974d84e8054e0aafe5bceef8d5dca14a65d5.zip
cpython-04f6974d84e8054e0aafe5bceef8d5dca14a65d5.tar.gz
cpython-04f6974d84e8054e0aafe5bceef8d5dca14a65d5.tar.bz2
- Issue #11147: Fix an unused argument in _Py_ANNOTATE_MEMORY_ORDER. (Fix
given by Campbell Barton).
-rw-r--r--Include/pyatomic.h1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Include/pyatomic.h b/Include/pyatomic.h
index da45327..d4e19e0 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 fbf18cc..f941c63 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1?
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.