diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2016-03-20 22:37:35 +0200 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2016-03-20 22:37:35 +0200 |
| commit | ec84ab0e0f5ceda69f69078923fc04482c1dda9b (patch) | |
| tree | d62e60009144884620f860e6f840ca91ed8de761 /src/libcore/sync | |
| parent | 173676efdc8a9f1f2a86d37c08a104e2e505f9e4 (diff) | |
| download | rust-ec84ab0e0f5ceda69f69078923fc04482c1dda9b.tar.gz rust-ec84ab0e0f5ceda69f69078923fc04482c1dda9b.zip | |
Update snapshots to 2016-03-18 (235d774).
Diffstat (limited to 'src/libcore/sync')
| -rw-r--r-- | src/libcore/sync/atomic.rs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index 40555481fc0..2055ca7adf3 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -1380,7 +1380,7 @@ unsafe fn atomic_sub<T>(dst: *mut T, val: T, order: Ordering) -> T { } #[inline] -#[cfg(not(stage0))] +#[cfg(any(not(stage0), cargobuild))] unsafe fn atomic_compare_exchange<T>(dst: *mut T, old: T, new: T, @@ -1408,7 +1408,7 @@ unsafe fn atomic_compare_exchange<T>(dst: *mut T, } #[inline] -#[cfg(stage0)] +#[cfg(all(stage0, not(cargobuild)))] unsafe fn atomic_compare_exchange<T>(dst: *mut T, old: T, new: T, @@ -1431,7 +1431,6 @@ unsafe fn atomic_compare_exchange<T>(dst: *mut T, } #[inline] -#[cfg(not(stage0))] unsafe fn atomic_compare_exchange_weak<T>(dst: *mut T, old: T, new: T, @@ -1459,18 +1458,6 @@ unsafe fn atomic_compare_exchange_weak<T>(dst: *mut T, } #[inline] -#[cfg(stage0)] -unsafe fn atomic_compare_exchange_weak<T>(dst: *mut T, - old: T, - new: T, - success: Ordering, - failure: Ordering) -> Result<T, T> - where T: ::cmp::Eq + ::marker::Copy -{ - atomic_compare_exchange(dst, old, new, success, failure) -} - -#[inline] unsafe fn atomic_and<T>(dst: *mut T, val: T, order: Ordering) -> T { match order { Acquire => intrinsics::atomic_and_acq(dst, val), |