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/common | |
| 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/common')
| -rw-r--r-- | src/libstd/sys/common/thread_local.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys/common/thread_local.rs index e9af796c674..edd16e0c062 100644 --- a/src/libstd/sys/common/thread_local.rs +++ b/src/libstd/sys/common/thread_local.rs @@ -58,7 +58,7 @@ use prelude::v1::*; -use sync::atomic::{self, AtomicUint, Ordering}; +use sync::atomic::{self, AtomicUsize, Ordering}; use sync::{Mutex, Once, ONCE_INIT}; use sys::thread_local as imp; @@ -97,7 +97,7 @@ pub struct StaticKey { /// Inner contents of `StaticKey`, created by the `INIT_INNER` constant. pub struct StaticKeyInner { - key: AtomicUint, + key: AtomicUsize, } /// A type for a safely managed OS-based TLS slot. @@ -137,7 +137,7 @@ pub const INIT: StaticKey = StaticKey { /// /// This value allows specific configuration of the destructor for a TLS key. pub const INIT_INNER: StaticKeyInner = StaticKeyInner { - key: atomic::ATOMIC_UINT_INIT, + key: atomic::ATOMIC_USIZE_INIT, }; static INIT_KEYS: Once = ONCE_INIT; |