diff options
| author | bors <bors@rust-lang.org> | 2013-07-15 21:01:20 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-15 21:01:20 -0700 |
| commit | 274e7a4e4999fe4e59a8ab0d71555f7f3eea3d6f (patch) | |
| tree | 8ebad07a9b590b0e627ebb323423072bbb136f6e /src/libstd/rt | |
| parent | 47ba4583dbf234c4a080496715700c0878472a78 (diff) | |
| parent | e118555ce67aadb0a58039b3e74f44a43b210528 (diff) | |
| download | rust-274e7a4e4999fe4e59a8ab0d71555f7f3eea3d6f.tar.gz rust-274e7a4e4999fe4e59a8ab0d71555f7f3eea3d6f.zip | |
auto merge of #7816 : thestinger/rust/header, r=huonw
Note that the headers are still on `~[T]` when `T` is managed. This is continued from #7605, which removed all the code relying on the headers and removed them from `~T` for non-managed `T`.
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/global_heap.rs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs index 68e57dd4940..d0b268ace54 100644 --- a/src/libstd/rt/global_heap.rs +++ b/src/libstd/rt/global_heap.rs @@ -84,14 +84,6 @@ pub unsafe fn exchange_malloc(size: uintptr_t) -> *c_char { malloc_raw(size as uint) as *c_char } -#[cfg(not(test))] -#[lang="vector_exchange_malloc"] -#[inline] -pub unsafe fn vector_exchange_malloc(align: u32, size: uintptr_t) -> *c_char { - let total_size = get_box_size(size as uint, align as uint); - malloc_raw(total_size as uint) as *c_char -} - // FIXME: #7496 #[cfg(not(test))] #[lang="closure_exchange_malloc"] |