summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-12-05 21:45:02 (GMT)
committerBarry Warsaw <barry@python.org>2011-12-05 21:45:02 (GMT)
commit9f5713546503628d4af0895eb76f1368160853be (patch)
tree9db315fc7bd89cb9d54d27da2c98a3c6d477c1fe
parent5b73ca4b3d5d53f949636eb5678ea31569adbdba (diff)
downloadcpython-9f5713546503628d4af0895eb76f1368160853be.zip
cpython-9f5713546503628d4af0895eb76f1368160853be.tar.gz
cpython-9f5713546503628d4af0895eb76f1368160853be.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 c532464..e65e805 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).