Skip to content

Commit 428ea7d

Browse files
committed
Revert atomicrmw {max, min, umax, umin}
1 parent 6534b4d commit 428ea7d

File tree

1 file changed

+0
-82
lines changed

1 file changed

+0
-82
lines changed

src/libstd/unstable/atomics.rs

-82
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ impl AtomicInt {
205205
pub fn fetch_sub(&mut self, val: int, order: Ordering) -> int {
206206
unsafe { atomic_sub(&mut self.v, val, order) }
207207
}
208-
209-
/// Returns the old value
210-
#[inline]
211-
pub fn fetch_min(&mut self, val: int, order: Ordering) -> int {
212-
unsafe { atomic_min(&mut self.v, val, order) }
213-
}
214-
215-
/// Returns the old value
216-
#[inline]
217-
pub fn fetch_max(&mut self, val: int, order: Ordering) -> int {
218-
unsafe { atomic_max(&mut self.v, val, order) }
219-
}
220208
}
221209

222210
impl AtomicUint {
@@ -255,18 +243,6 @@ impl AtomicUint {
255243
pub fn fetch_sub(&mut self, val: uint, order: Ordering) -> uint {
256244
unsafe { atomic_sub(&mut self.v, val, order) }
257245
}
258-
259-
/// Returns the old value
260-
#[inline]
261-
pub fn fetch_min(&mut self, val: uint, order: Ordering) -> uint {
262-
unsafe { atomic_umin(&mut self.v, val, order) }
263-
}
264-
265-
/// Returns the old value
266-
#[inline]
267-
pub fn fetch_max(&mut self, val: uint, order: Ordering) -> uint {
268-
unsafe { atomic_umax(&mut self.v, val, order) }
269-
}
270246
}
271247

272248
impl<T> AtomicPtr<T> {
@@ -515,64 +491,6 @@ pub unsafe fn atomic_xor<T>(dst: &mut T, val: T, order: Ordering) -> T {
515491
}
516492

517493

518-
#[inline]
519-
pub unsafe fn atomic_max<T>(dst: &mut T, val: T, order: Ordering) -> T {
520-
let dst = cast::transmute(dst);
521-
let val = cast::transmute(val);
522-
523-
cast::transmute(match order {
524-
Acquire => intrinsics::atomic_max_acq(dst, val),
525-
Release => intrinsics::atomic_max_rel(dst, val),
526-
AcqRel => intrinsics::atomic_max_acqrel(dst, val),
527-
Relaxed => intrinsics::atomic_max_relaxed(dst, val),
528-
_ => intrinsics::atomic_max(dst, val)
529-
})
530-
}
531-
532-
533-
#[inline]
534-
pub unsafe fn atomic_min<T>(dst: &mut T, val: T, order: Ordering) -> T {
535-
let dst = cast::transmute(dst);
536-
let val = cast::transmute(val);
537-
538-
cast::transmute(match order {
539-
Acquire => intrinsics::atomic_min_acq(dst, val),
540-
Release => intrinsics::atomic_min_rel(dst, val),
541-
AcqRel => intrinsics::atomic_min_acqrel(dst, val),
542-
Relaxed => intrinsics::atomic_min_relaxed(dst, val),
543-
_ => intrinsics::atomic_min(dst, val)
544-
})
545-
}
546-
547-
#[inline]
548-
pub unsafe fn atomic_umax<T>(dst: &mut T, val: T, order: Ordering) -> T {
549-
let dst = cast::transmute(dst);
550-
let val = cast::transmute(val);
551-
552-
cast::transmute(match order {
553-
Acquire => intrinsics::atomic_umax_acq(dst, val),
554-
Release => intrinsics::atomic_umax_rel(dst, val),
555-
AcqRel => intrinsics::atomic_umax_acqrel(dst, val),
556-
Relaxed => intrinsics::atomic_umax_relaxed(dst, val),
557-
_ => intrinsics::atomic_umax(dst, val)
558-
})
559-
}
560-
561-
562-
#[inline]
563-
pub unsafe fn atomic_umin<T>(dst: &mut T, val: T, order: Ordering) -> T {
564-
let dst = cast::transmute(dst);
565-
let val = cast::transmute(val);
566-
567-
cast::transmute(match order {
568-
Acquire => intrinsics::atomic_umin_acq(dst, val),
569-
Release => intrinsics::atomic_umin_rel(dst, val),
570-
AcqRel => intrinsics::atomic_umin_acqrel(dst, val),
571-
Relaxed => intrinsics::atomic_umin_relaxed(dst, val),
572-
_ => intrinsics::atomic_umin(dst, val)
573-
})
574-
}
575-
576494
/**
577495
* An atomic fence.
578496
*

0 commit comments

Comments
 (0)