[Python-checkins] cpython (merge 3.2 -> default): Merge branch 3.2 (closes #13338)

[petri.lehtinen]

http://hg.python.org/cpython/rev/c2e588a5237a
changeset:   73625:c2e588a5237a
parent:      73623:71100ef4f7a2
parent:      73624:f855f929bc48
user:        Petri Lehtinen <petri at digip.org>
date:        Sat Nov 19 22:04:33 2011 +0200
summary:
  Merge branch 3.2 (closes #13338)

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


diff --git a/Include/pyatomic.h b/Include/pyatomic.h
--- a/Include/pyatomic.h
+++ b/Include/pyatomic.h
@@ -64,7 +64,8 @@
     case _Py_memory_order_seq_cst:
         _Py_ANNOTATE_HAPPENS_BEFORE(address);
         break;
-    default:
+    case _Py_memory_order_relaxed:
+    case _Py_memory_order_acquire:
         break;
     }
     switch(order) {
@@ -73,7 +74,8 @@
     case _Py_memory_order_seq_cst:
         _Py_ANNOTATE_HAPPENS_AFTER(address);
         break;
-    default:
+    case _Py_memory_order_relaxed:
+    case _Py_memory_order_release:
         break;
     }
 }
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -132,6 +132,7 @@
 Oleg Broytmann
 Dave Brueck
 Francisco Martín Brugué
+Floris Bruynooghe
 Stan Bubrouski
 Erik de Bueger
 Jan-Hein Bührman
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER
+  to allow compiling extension modules with -Wswitch-enum on gcc.
+  Initial patch by Floris Bruynooghe.
+
 - Issue #10227: Add an allocation cache for a single slice object.  Patch by
   Stefan Behnel.
 

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