---

thestinger · thestinger · commit 98169f3b914b · 2013-05-27T18:14:00.000-04:00
yaml --- r: 141271 b: refs/heads/try2 c: e6c04de h: refs/heads/master i: 141269: d6e8d22 141267: 5265624 141263: 0b3593d v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 14846613bbd72003dd8f244b64ad679b586b6dd9
+refs/heads/try2: e6c04dea0325af808198306e283c17f90d31fc26
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libstd/cast.rs b/branches/try2/src/libstd/cast.rs
@@ -33,7 +33,7 @@ pub unsafe fn transmute_copy<T, U>(src: &T) -> U {
     let mut dest: U = intrinsics::uninit();
     let dest_ptr: *mut u8 = transmute(&mut dest);
     let src_ptr: *u8 = transmute(src);
-    intrinsics::memcpy32(dest_ptr, src_ptr, sys::size_of::<U>() as u64);
+    intrinsics::memcpy32(dest_ptr, src_ptr, sys::size_of::<U>() as u32);
     dest
 }
 
diff --git a/branches/try2/src/libstd/ptr.rs b/branches/try2/src/libstd/ptr.rs
@@ -109,7 +109,7 @@ pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
 #[cfg(target_word_size = "32", not(stage0))]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
     use unstable::intrinsics::memmove32;
-    memmove32(dst, src, count as u32);
+    memmove32(dst, src as *T, count as u32);
 }
 
 #[inline(always)]

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ pub unsafe fn transmute_copy<T, U>(src: &T) -> U {`
`33`	`33`	`let mut dest: U = intrinsics::uninit();`
`34`	`34`	`let dest_ptr: *mut u8 = transmute(&mut dest);`
`35`	`35`	`let src_ptr: *u8 = transmute(src);`
`36`		`- intrinsics::memcpy32(dest_ptr, src_ptr, sys::size_of::<U>() as u64);`
	`36`	`+ intrinsics::memcpy32(dest_ptr, src_ptr, sys::size_of::<U>() as u32);`
`37`	`37`	`dest`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ pub unsafe fn copy_memory<T>(dst: mut T, src: const T, count: uint) {`
`109`	`109`	`#[cfg(target_word_size = "32", not(stage0))]`
`110`	`110`	`pub unsafe fn copy_memory<T>(dst: mut T, src: const T, count: uint) {`
`111`	`111`	`use unstable::intrinsics::memmove32;`
`112`		`- memmove32(dst, src, count as u32);`
	`112`	`+ memmove32(dst, src as *T, count as u32);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`#[inline(always)]`