summary refs log tree commit diff
path: root/src/libstd/sync/condvar.rs
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2015-01-10 13:42:48 -0800
committerSteven Fackler <sfackler@gmail.com>2015-01-11 11:47:44 -0800
commit8b6cda3ce681d4d95c3097d12ed754975b4a07f6 (patch)
tree8d81e1972bcde3ad102209dc9560bf07735995f2 /src/libstd/sync/condvar.rs
parent099b411e080d302ec0dc5f3aebe53d76c50acfc7 (diff)
downloadrust-8b6cda3ce681d4d95c3097d12ed754975b4a07f6.tar.gz
rust-8b6cda3ce681d4d95c3097d12ed754975b4a07f6.zip
Rename AtomicInt and AtomicUint
Change any use of AtomicInt to AtomicIsize and AtomicUint to AtomicUsize

Closes #20893

[breaking-change]
Diffstat (limited to 'src/libstd/sync/condvar.rs')
-rw-r--r--src/libstd/sync/condvar.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs
index 3c0ae71255d..bcd5f56a353 100644
--- a/src/libstd/sync/condvar.rs
+++ b/src/libstd/sync/condvar.rs
@@ -10,7 +10,7 @@
 
 use prelude::v1::*;
 
-use sync::atomic::{AtomicUint, Ordering, ATOMIC_UINT_INIT};
+use sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
 use sync::poison::{self, LockResult};
 use sys_common::condvar as sys;
 use sys_common::mutex as sys_mutex;
@@ -78,7 +78,7 @@ unsafe impl Sync for Condvar {}
 #[unstable = "may be merged with Condvar in the future"]
 pub struct StaticCondvar {
     inner: sys::Condvar,
-    mutex: AtomicUint,
+    mutex: AtomicUsize,
 }
 
 unsafe impl Send for StaticCondvar {}
@@ -88,7 +88,7 @@ unsafe impl Sync for StaticCondvar {}
 #[unstable = "may be merged with Condvar in the future"]
 pub const CONDVAR_INIT: StaticCondvar = StaticCondvar {
     inner: sys::CONDVAR_INIT,
-    mutex: ATOMIC_UINT_INIT,
+    mutex: ATOMIC_USIZE_INIT,
 };
 
 impl Condvar {
@@ -99,7 +99,7 @@ impl Condvar {
         Condvar {
             inner: box StaticCondvar {
                 inner: unsafe { sys::Condvar::new() },
-                mutex: AtomicUint::new(0),
+                mutex: AtomicUsize::new(0),
             }
         }
     }