diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2014-12-27 00:34:51 +0100 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2015-01-07 19:19:01 +0000 |
| commit | ea9d5c96536059b232dd6aa40af7a1d181f7b196 (patch) | |
| tree | 93de25480c8c116e5c6e65eded261075c2c699c2 /src/liballoc | |
| parent | 2b84e44b077339e175103979c1c6d4c26b235119 (diff) | |
| download | rust-ea9d5c96536059b232dd6aa40af7a1d181f7b196.tar.gz rust-ea9d5c96536059b232dd6aa40af7a1d181f7b196.zip | |
liballoc's "extern_funcs" impl mod had a duplicate and missing item
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 69aeaf44793..14ba5437565 100644 --- a/src/liballoc/heap.rs +++ b/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] |