From 8b6cda3ce681d4d95c3097d12ed754975b4a07f6 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Sat, 10 Jan 2015 13:42:48 -0800 Subject: Rename AtomicInt and AtomicUint Change any use of AtomicInt to AtomicIsize and AtomicUint to AtomicUsize Closes #20893 [breaking-change] --- src/libstd/sync/mpsc/stream.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstd/sync/mpsc/stream.rs') diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index f4b20c7b742..a03add8c532 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.rs @@ -28,7 +28,7 @@ use core::cmp; use core::int; use thread::Thread; -use sync::atomic::{AtomicInt, AtomicUint, Ordering, AtomicBool}; +use sync::atomic::{AtomicIsize, AtomicUsize, Ordering, AtomicBool}; use sync::mpsc::Receiver; use sync::mpsc::blocking::{self, SignalToken}; use sync::mpsc::spsc_queue as spsc; @@ -42,9 +42,9 @@ const MAX_STEALS: int = 1 << 20; pub struct Packet { queue: spsc::Queue>, // internal queue for all message - cnt: AtomicInt, // How many items are on this channel + cnt: AtomicIsize, // How many items are on this channel steals: int, // How many times has a port received without blocking? - to_wake: AtomicUint, // SignalToken for the blocked thread to wake up + to_wake: AtomicUsize, // SignalToken for the blocked thread to wake up port_dropped: AtomicBool, // flag if the channel has been destroyed. } @@ -79,9 +79,9 @@ impl Packet { Packet { queue: unsafe { spsc::Queue::new(128) }, - cnt: AtomicInt::new(0), + cnt: AtomicIsize::new(0), steals: 0, - to_wake: AtomicUint::new(0), + to_wake: AtomicUsize::new(0), port_dropped: AtomicBool::new(false), } -- cgit 1.4.1-3-g733a5