diff options
| author | Petri Lehtinen <petri@digip.org> | 2011-11-19 20:04:33 (GMT) |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2011-11-19 20:04:33 (GMT) |
| commit | aadc519ceb91124b3078bb409f2282ffc8ef8765 (patch) | |
| tree | 5aea90ffb8657cc083113a5af8652a6a70e0ac99 /Include | |
| parent | b96172e2cfbbd047959cb8b2a5b84b0b32388842 (diff) | |
| parent | 8d40f16a6021dc7fbba1bdc1bbda27ea1e955777 (diff) | |
| download | cpython-aadc519ceb91124b3078bb409f2282ffc8ef8765.zip cpython-aadc519ceb91124b3078bb409f2282ffc8ef8765.tar.gz cpython-aadc519ceb91124b3078bb409f2282ffc8ef8765.tar.bz2 | |
Merge branch 3.2 (closes #13338)
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/pyatomic.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ _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; } } |