Merge branch 3.2 (closes #13338)
diff --git a/Include/pyatomic.h b/Include/pyatomic.h
index b0028fd..da45327 100644
--- 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
index 986debd..acf2147 100644
--- 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
index 183e4ed..90c0f3b 100644
--- 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.