diff options
| author | bors <bors@rust-lang.org> | 2015-01-12 22:56:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-12 22:56:20 +0000 |
| commit | 3d0d9bb6fbdf6ead9396f0874cf38f3ef7c9be5c (patch) | |
| tree | 9994c5b80534154e0130716d304d9185e7ae3481 /src/libstd/sys/unix | |
| parent | 3a44a19af29585c02e81e22ea7665f829ae0590a (diff) | |
| parent | 8b6cda3ce681d4d95c3097d12ed754975b4a07f6 (diff) | |
| download | rust-3d0d9bb6fbdf6ead9396f0874cf38f3ef7c9be5c.tar.gz rust-3d0d9bb6fbdf6ead9396f0874cf38f3ef7c9be5c.zip | |
auto merge of #20896 : sfackler/rust/atomic-rename, r=alexcrichton
Change any use of AtomicInt to AtomicIsize and AtomicUint to AtomicUsize Closes #20893 [breaking-change]
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/timer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/timer.rs b/src/libstd/sys/unix/timer.rs index 62f3242a206..c0c231a9e73 100644 --- a/src/libstd/sys/unix/timer.rs +++ b/src/libstd/sys/unix/timer.rs @@ -211,7 +211,7 @@ impl Timer { // instead of () HELPER.boot(|| {}, helper); - static ID: atomic::AtomicUint = atomic::ATOMIC_UINT_INIT; + static ID: atomic::AtomicUsize = atomic::ATOMIC_USIZE_INIT; let id = ID.fetch_add(1, Ordering::Relaxed); Ok(Timer { id: id, |