traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 3.2 (closes #13338)

This commit is contained in:
Petri Lehtinen 2011-11-19 22:04:33 +02:00
parent b96172e2cf 8d40f16a60
commit aadc519ceb
3 changed files with 9 additions and 2 deletions
Show Stats 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:
_Py_ANNOTATE_HAPPENS_BEFORE(address);
break;
default:
case _Py_memory_order_relaxed:
case _Py_memory_order_acquire:
break;
}
switch(order) {
@ -73,7 +74,8 @@ _Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order)
case _Py_memory_order_seq_cst:
_Py_ANNOTATE_HAPPENS_AFTER(address);
break;
default:
case _Py_memory_order_relaxed:
case _Py_memory_order_release:
break;
}
}

1
Misc/ACKS
View File

@ -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

4
Misc/NEWS
View File

@ -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
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.