diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-01-27 22:41:25 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-03 12:05:16 -0800 |
| commit | acacfb20fd34162cfba5a4e7b5f1447e0403fa50 (patch) | |
| tree | 0790d82726f49abc6d37b8ac5c8ca0fbec7e0685 /src/libstd/sync | |
| parent | 984727ff87bb8a9f345ababf473d1141f9e05c08 (diff) | |
| download | rust-acacfb20fd34162cfba5a4e7b5f1447e0403fa50.tar.gz rust-acacfb20fd34162cfba5a4e7b5f1447e0403fa50.zip | |
Various bug fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/atomics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/atomics.rs b/src/libstd/sync/atomics.rs index 6ce285152de..fb62bed9ed0 100644 --- a/src/libstd/sync/atomics.rs +++ b/src/libstd/sync/atomics.rs @@ -384,7 +384,7 @@ impl<T> AtomicOption<T> { } #[cfg(stage0)] - pub fn empty() -> AtomicOption<T> { AtomicOption { p: 0 as *mut c_void } } + pub fn empty() -> AtomicOption<T> { AtomicOption { p: 0 as *mut u8 } } #[cfg(not(stage0))] pub fn empty() -> AtomicOption<T> { AtomicOption { p: 0 } } |