From 428ea7d7ce39c46a57eaf09b10d9a3d4a488e6e8 Mon Sep 17 00:00:00 2001 From: Seo Sanghyeon Date: Wed, 31 Jul 2013 19:44:20 +0900 Subject: [PATCH] Revert atomicrmw {max, min, umax, umin} --- src/libstd/unstable/atomics.rs | 82 ---------------------------------- 1 file changed, 82 deletions(-) diff --git a/src/libstd/unstable/atomics.rs b/src/libstd/unstable/atomics.rs index 6f514ca609dbf..6f66cdbe8a78b 100644 --- a/src/libstd/unstable/atomics.rs +++ b/src/libstd/unstable/atomics.rs @@ -205,18 +205,6 @@ impl AtomicInt { pub fn fetch_sub(&mut self, val: int, order: Ordering) -> int { unsafe { atomic_sub(&mut self.v, val, order) } } - - /// Returns the old value - #[inline] - pub fn fetch_min(&mut self, val: int, order: Ordering) -> int { - unsafe { atomic_min(&mut self.v, val, order) } - } - - /// Returns the old value - #[inline] - pub fn fetch_max(&mut self, val: int, order: Ordering) -> int { - unsafe { atomic_max(&mut self.v, val, order) } - } } impl AtomicUint { @@ -255,18 +243,6 @@ impl AtomicUint { pub fn fetch_sub(&mut self, val: uint, order: Ordering) -> uint { unsafe { atomic_sub(&mut self.v, val, order) } } - - /// Returns the old value - #[inline] - pub fn fetch_min(&mut self, val: uint, order: Ordering) -> uint { - unsafe { atomic_umin(&mut self.v, val, order) } - } - - /// Returns the old value - #[inline] - pub fn fetch_max(&mut self, val: uint, order: Ordering) -> uint { - unsafe { atomic_umax(&mut self.v, val, order) } - } } impl AtomicPtr { @@ -515,64 +491,6 @@ pub unsafe fn atomic_xor(dst: &mut T, val: T, order: Ordering) -> T { } -#[inline] -pub unsafe fn atomic_max(dst: &mut T, val: T, order: Ordering) -> T { - let dst = cast::transmute(dst); - let val = cast::transmute(val); - - cast::transmute(match order { - Acquire => intrinsics::atomic_max_acq(dst, val), - Release => intrinsics::atomic_max_rel(dst, val), - AcqRel => intrinsics::atomic_max_acqrel(dst, val), - Relaxed => intrinsics::atomic_max_relaxed(dst, val), - _ => intrinsics::atomic_max(dst, val) - }) -} - - -#[inline] -pub unsafe fn atomic_min(dst: &mut T, val: T, order: Ordering) -> T { - let dst = cast::transmute(dst); - let val = cast::transmute(val); - - cast::transmute(match order { - Acquire => intrinsics::atomic_min_acq(dst, val), - Release => intrinsics::atomic_min_rel(dst, val), - AcqRel => intrinsics::atomic_min_acqrel(dst, val), - Relaxed => intrinsics::atomic_min_relaxed(dst, val), - _ => intrinsics::atomic_min(dst, val) - }) -} - -#[inline] -pub unsafe fn atomic_umax(dst: &mut T, val: T, order: Ordering) -> T { - let dst = cast::transmute(dst); - let val = cast::transmute(val); - - cast::transmute(match order { - Acquire => intrinsics::atomic_umax_acq(dst, val), - Release => intrinsics::atomic_umax_rel(dst, val), - AcqRel => intrinsics::atomic_umax_acqrel(dst, val), - Relaxed => intrinsics::atomic_umax_relaxed(dst, val), - _ => intrinsics::atomic_umax(dst, val) - }) -} - - -#[inline] -pub unsafe fn atomic_umin(dst: &mut T, val: T, order: Ordering) -> T { - let dst = cast::transmute(dst); - let val = cast::transmute(val); - - cast::transmute(match order { - Acquire => intrinsics::atomic_umin_acq(dst, val), - Release => intrinsics::atomic_umin_rel(dst, val), - AcqRel => intrinsics::atomic_umin_acqrel(dst, val), - Relaxed => intrinsics::atomic_umin_relaxed(dst, val), - _ => intrinsics::atomic_umin(dst, val) - }) -} - /** * An atomic fence. *