about summary refs log tree commit diff
path: root/src/rt/rust_shape.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2011-12-06 20:55:03 -0800
committerBrian Anderson <banderson@mozilla.com>2011-12-06 21:44:18 -0800
commitc11d0b0aa0343fbc6ddf8114ce96904c9870de8a (patch)
tree0091e1e286124f43d2d5665545f2843d75ab47d9 /src/rt/rust_shape.cpp
parent9b7347dd9648fd4cdf134700ec35bc370022da2b (diff)
downloadrust-c11d0b0aa0343fbc6ddf8114ce96904c9870de8a.tar.gz
rust-c11d0b0aa0343fbc6ddf8114ce96904c9870de8a.zip
rt: Move upcall_cmp_type/upcall_log_type to rust_upcall.cpp
Diffstat (limited to 'src/rt/rust_shape.cpp')
-rw-r--r--src/rt/rust_shape.cpp8
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?