cpython: c2e588a5237a (original) (raw)
Mercurial > cpython
changeset 73625:c2e588a5237a
Merge branch 3.2 (closes #13338) [#13338]
| Petri Lehtinen petri@digip.org | |
|---|---|
| date | Sat, 19 Nov 2011 22:04:33 +0200 |
| parents | 71100ef4f7a2(current diff)f855f929bc48(diff) |
| children | f1cafe6f7834 |
| files | Misc/ACKS Misc/NEWS |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-)[+] [-] Include/pyatomic.h 6 Misc/ACKS 1 Misc/NEWS 4 |
line wrap: on
line diff
--- a/Include/pyatomic.h +++ b/Include/pyatomic.h @@ -64,7 +64,8 @@ static inline void case _Py_memory_order_seq_cst: _Py_ANNOTATE_HAPPENS_BEFORE(address); break;
- case _Py_memory_order_relaxed:
- case _Py_memory_order_acquire: break; } switch(order) { @@ -73,7 +74,8 @@ static inline void case _Py_memory_order_seq_cst: _Py_ANNOTATE_HAPPENS_AFTER(address); break;
--- a/Misc/ACKS +++ b/Misc/ACKS @@ -132,6 +132,7 @@ Titus Brown Oleg Broytmann Dave Brueck Francisco Martín Brugué +Floris Bruynooghe Stan Bubrouski Erik de Bueger Jan-Hein Bührman
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,10 @@ What's New in Python 3.3 Alpha 1? Core and Builtins ----------------- +- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER