diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2011-12-07 11:52:38 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-12-07 11:52:38 -0800 |
| commit | a3f48d3fe1d90a4684cb20e75688ffbca804e82c (patch) | |
| tree | f8ca510a3e827cb31e38cffdc260ab6112cf6b79 /src/rt/rust_shape.cpp | |
| parent | 1652b921fa2fadc936b346fc3de217cf97b0e476 (diff) | |
| parent | 6c95e400d82699887b66f5de0fef2bb5e1f8cc32 (diff) | |
| download | rust-a3f48d3fe1d90a4684cb20e75688ffbca804e82c.tar.gz rust-a3f48d3fe1d90a4684cb20e75688ffbca804e82c.zip | |
Merge branch 'master' of github.com:graydon/rust
Diffstat (limited to 'src/rt/rust_shape.cpp')
| -rw-r--r-- | src/rt/rust_shape.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rt/rust_shape.cpp b/src/rt/rust_shape.cpp index 326e4e2a514..3593d0ff335 100644 --- a/src/rt/rust_shape.cpp +++ b/src/rt/rust_shape.cpp @@ -530,9 +530,9 @@ log::walk_res(const rust_fn *dtor, unsigned n_params, } // end namespace shape extern "C" void -upcall_cmp_type(int8_t *result, const type_desc *tydesc, - const type_desc **subtydescs, uint8_t *data_0, - uint8_t *data_1, uint8_t cmp_type) { +shape_cmp_type(int8_t *result, const type_desc *tydesc, + const type_desc **subtydescs, uint8_t *data_0, + uint8_t *data_1, uint8_t cmp_type) { rust_task *task = rust_scheduler::get_task(); shape::arena arena; @@ -553,7 +553,7 @@ upcall_cmp_type(int8_t *result, const type_desc *tydesc, } extern "C" void -upcall_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) { +shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) { rust_task *task = rust_scheduler::get_task(); if (task->sched->log_lvl < level) return; // TODO: Don't evaluate at all? |