---

Ericson2314 · Ericson2314 · commit 1aabac8b95e5 · 2015-01-07T19:19:01.000Z
yaml --- r: 171019 b: refs/heads/try c: ea9d5c9 h: refs/heads/master i: 171017: 7199811 171015: d719177 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 73a25f55ad748b4d3516417c711b99ce446591af
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
-refs/heads/try: 2b84e44b077339e175103979c1c6d4c26b235119
+refs/heads/try: ea9d5c96536059b232dd6aa40af7a1d181f7b196
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try/src/liballoc/heap.rs b/branches/try/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]`