diff options
| author | bors <bors@rust-lang.org> | 2013-08-11 14:17:09 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-11 14:17:09 -0700 |
| commit | b285f1e6c90332188bb720bf320c507fc4156fdc (patch) | |
| tree | b1b5657b028f7a1c5253ae3bc8d87b806e464a6e /src/rt | |
| parent | 63c62bea3ac2782ae421d5bd211f2e7393bad7a2 (diff) | |
| parent | 7343478d67ba3eb0c62dcc37db65d82d12b8e140 (diff) | |
| download | rust-b285f1e6c90332188bb720bf320c507fc4156fdc.tar.gz rust-b285f1e6c90332188bb720bf320c507fc4156fdc.zip | |
auto merge of #8455 : nikomatsakis/rust/issue-5762-objects-dralston-d, r=graydon
Fix #5762 and various other aspects of object invocation. r? @graydon
Diffstat (limited to 'src/rt')
| -rw-r--r-- | src/rt/rust_type.h | 1 | ||||
| -rw-r--r-- | src/rt/rust_util.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/rt/rust_type.h b/src/rt/rust_type.h index 60ca5674b01..57538f1ec75 100644 --- a/src/rt/rust_type.h +++ b/src/rt/rust_type.h @@ -58,6 +58,7 @@ struct type_desc { glue_fn *drop_glue; glue_fn *free_glue; glue_fn *visit_glue; + size_t borrow_offset; }; extern "C" type_desc *rust_clone_type_desc(type_desc*); diff --git a/src/rt/rust_util.cpp b/src/rt/rust_util.cpp index 4a15830e529..28c69af427a 100644 --- a/src/rt/rust_util.cpp +++ b/src/rt/rust_util.cpp @@ -21,6 +21,7 @@ struct type_desc str_body_tydesc = { NULL, // drop_glue NULL, // free_glue NULL, // visit_glue + 0, // borrow_offset }; // |