diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-19 20:25:46 -0700 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-07-19 20:25:46 -0700 |
| commit | 8d97c905ddecec2e2d0d72926bc4c9e739ccb6e3 (patch) | |
| tree | 1c80a4d22820b1630617b076c212ddde942d83f5 /src/libstd/rt | |
| parent | 0d04aa78e5e8a7e3c48141028137c1a69e7e32ee (diff) | |
| parent | eb74f0ccf60a1e8dda1afe9a3be0e8dd4fd96f9f (diff) | |
| download | rust-8d97c905ddecec2e2d0d72926bc4c9e739ccb6e3.tar.gz rust-8d97c905ddecec2e2d0d72926bc4c9e739ccb6e3.zip | |
Merge pull request #7897 from thestinger/double
rollup of small pull requests 404de4f r=huonw 0cdb0a2 r=pcwalton b082302 r=sanxiyn b6a0138 r=huonw 8d64fa3 r=graydon ddd8c15 r=thestinger eb74f0c r=thestinger
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/context.rs b/src/libstd/rt/context.rs index 09ba869549f..b30a55978f7 100644 --- a/src/libstd/rt/context.rs +++ b/src/libstd/rt/context.rs @@ -209,6 +209,6 @@ fn align_down(sp: *mut uint) -> *mut uint { // XXX: ptr::offset is positive ints only #[inline] pub fn mut_offset<T>(ptr: *mut T, count: int) -> *mut T { - use core::sys::size_of; + use std::sys::size_of; (ptr as int + count * (size_of::<T>() as int)) as *mut T } |