OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rollup merge of #23793: steveklabnik/gh21668 

Fixes #21668
This commit is contained in:
Alex Crichton 2015-03-27 13:04:38 -07:00
parent 828c36932a 1a6188aa07
commit 1c78478c12
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcore/atomic.rs
View File

@ -252,7 +252,8 @@ impl AtomicBool {
/// Stores a value into the bool if the current value is the same as the expected value.
///
/// If the return value is equal to `old` then the value was updated.
/// The return value is always the previous value. If it is equal to `old`, then the value was
/// updated.
///
/// `swap` also takes an `Ordering` argument which describes the memory ordering of this
/// operation.
@ -489,7 +490,8 @@ impl AtomicIsize {
/// Stores a value into the isize if the current value is the same as the expected value.
///
/// If the return value is equal to `old` then the value was updated.
/// The return value is always the previous value. If it is equal to `old`, then the value was
/// updated.
///
/// `compare_and_swap` also takes an `Ordering` argument which describes the memory ordering of
/// this operation.
@ -676,7 +678,8 @@ impl AtomicUsize {
/// Stores a value into the usize if the current value is the same as the expected value.
///
/// If the return value is equal to `old` then the value was updated.
/// The return value is always the previous value. If it is equal to `old`, then the value was
/// updated.
///
/// `compare_and_swap` also takes an `Ordering` argument which describes the memory ordering of
/// this operation.
@ -873,7 +876,8 @@ impl<T> AtomicPtr<T> {
/// Stores a value into the pointer if the current value is the same as the expected value.
///
/// If the return value is equal to `old` then the value was updated.
/// The return value is always the previous value. If it is equal to `old`, then the value was
/// updated.
///
/// `compare_and_swap` also takes an `Ordering` argument which describes the memory ordering of
/// this operation.