mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 3.2 (closes #13338)

Browse source
This commit is contained in:
Petri Lehtinen 2011-11-19 22:04:33 +02:00
commit aadc519ceb
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Include/pyatomic.h
View file

@ -64,7 +64,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
case _Py_memory_order_seq_cst: case _Py_memory_order_seq_cst:
_Py_ANNOTATE_HAPPENS_BEFORE(address); _Py_ANNOTATE_HAPPENS_BEFORE(address);
break; break;
default: case _Py_memory_order_relaxed:
case _Py_memory_order_acquire:
break; break;
} }
switch(order) { switch(order) {
@ -73,7 +74,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
case _Py_memory_order_seq_cst: case _Py_memory_order_seq_cst:
_Py_ANNOTATE_HAPPENS_AFTER(address); _Py_ANNOTATE_HAPPENS_AFTER(address);
break; break;
default: case _Py_memory_order_relaxed:
case _Py_memory_order_release:
break; break;
} }
} }

1
Misc/ACKS
View file

@ -132,6 +132,7 @@ Titus Brown
Oleg Broytmann Oleg Broytmann
Dave Brueck Dave Brueck
Francisco Martín Brugué Francisco Martín Brugué
Floris Bruynooghe
Stan Bubrouski Stan Bubrouski
Erik de Bueger Erik de Bueger
Jan-Hein Bührman Jan-Hein Bührman

4
Misc/NEWS
View file

@ -10,6 +10,10 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins 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 - Issue #10227: Add an allocation cache for a single slice object. Patch by
Stefan Behnel. Stefan Behnel.