auto merge of #6053 : nikomatsakis/rust/fixme-2699, r=thestinger

r? @jld or @graydon

The calculation looks right to me, but perhaps one of you two can double check.  You two seem like you are doing the most recent work in this sort of area.
This commit is contained in:
bors 2013-06-06 13:52:41 -07:00
commit 533425e242
1 changed files with 0 additions and 1 deletions

View File

@ -81,7 +81,6 @@ typedef rust_vec_box rust_str;
inline size_t get_box_size(size_t body_size, size_t body_align) {
size_t header_size = sizeof(rust_opaque_box);
// FIXME (#2699): This alignment calculation is suspicious. Is it right?
size_t total_size = align_to(header_size, body_align) + body_size;
return total_size;
}