diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2011-06-28 16:52:29 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2011-06-28 16:52:59 -0700 |
| commit | dfcfef41df58108ee75067afaa63bbbcf43e38f8 (patch) | |
| tree | 7abfc613aafac9dae3668169f59d4e7ca878d406 /src/rt/rust_upcall.cpp | |
| parent | 1d37118a00d5343641c7a949c89bf5a4841c1eec (diff) | |
| download | rust-dfcfef41df58108ee75067afaa63bbbcf43e38f8.tar.gz rust-dfcfef41df58108ee75067afaa63bbbcf43e38f8.zip | |
rustc: Rename take glue to copy glue
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index f6257470b29..7b1ddc4c3a4 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -453,13 +453,14 @@ copy_elements(rust_task *task, type_desc *elem_t, { char *dst = (char *)pdst, *src = (char *)psrc; + // FIXME: Copy glue doesn't work this way. // increment the refcount of each element of the vector - if (elem_t->take_glue) { - glue_fn *take_glue = elem_t->take_glue; + if (elem_t->copy_glue) { + glue_fn *copy_glue = elem_t->copy_glue; size_t elem_size = elem_t->size; const type_desc **tydescs = elem_t->first_param; for (char *p = src; p < src+n; p += elem_size) { - take_glue(NULL, task, NULL, tydescs, p); + copy_glue(NULL, task, NULL, tydescs, p); } } memmove(dst, src, n); |