---

Ericson2314 · Ericson2314 · commit 02c23c4061d2 · 2015-01-07T19:19:01.000Z
yaml --- r: 171518 b: refs/heads/batch c: ea9d5c9 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
 refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
-refs/heads/batch: 2b84e44b077339e175103979c1c6d4c26b235119
+refs/heads/batch: ea9d5c96536059b232dd6aa40af7a1d181f7b196
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
diff --git a/branches/batch/src/liballoc/heap.rs b/branches/batch/src/liballoc/heap.rs
@@ -142,14 +142,13 @@ mod imp {
     }
 
     #[inline]
-    pub unsafe fn reallocate_inplace(ptr: *mut u8, old_size: uint, size: uint,
-                                     align: uint) -> uint {
-        rust_reallocate_inplace(ptr, old_size, size, align)
+    pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) {
+        rust_deallocate(ptr, old_size, align)
     }
 
     #[inline]
-    pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) {
-        rust_deallocate(ptr, old_size, align)
+    pub unsafe fn reallocate(ptr: *mut u8, old_size: uint, size: uint, align: uint) -> *mut u8 {
+        rust_reallocate(ptr, old_size, size, align)
     }
 
     #[inline]

Original file line number	Diff line number	Diff line change
`@@ -142,14 +142,13 @@ mod imp {`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`#[inline]`
`145`		`- pub unsafe fn reallocate_inplace(ptr: *mut u8, old_size: uint, size: uint,`
`146`		`- align: uint) -> uint {`
`147`		`- rust_reallocate_inplace(ptr, old_size, size, align)`
	`145`	`+ pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) {`
	`146`	`+ rust_deallocate(ptr, old_size, align)`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`#[inline]`
`151`		`- pub unsafe fn deallocate(ptr: *mut u8, old_size: uint, align: uint) {`
`152`		`- rust_deallocate(ptr, old_size, align)`
	`150`	`+ pub unsafe fn reallocate(ptr: mut u8, old_size: uint, size: uint, align: uint) -> mut u8 {`
	`151`	`+ rust_reallocate(ptr, old_size, size, align)`
`153`	`152`	`}`
`154`	`153`
`155`	`154`	`#[inline]`