about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-02-12 14:36:33 -0800
committerbors <bors@rust-lang.org>2013-02-12 14:36:33 -0800
commitbc2d147847f2c8190250ddb25e3bc71b38cfaf0a (patch)
tree58ac04240d689afa51da396928a0a2583769f8a8 /src/rt/rust_builtin.cpp
parent21a0d52a85895434ec1ac2f2293b89112bfc0002 (diff)
parent0db527e2f8033e49ee588b3be71f3cd7a0d13b7c (diff)
downloadrust-bc2d147847f2c8190250ddb25e3bc71b38cfaf0a.tar.gz
rust-bc2d147847f2c8190250ddb25e3bc71b38cfaf0a.zip
auto merge of #4858 : z0w0/rust/rm_weak_task_count, r=graydon
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index e14f62ffae9..7c1d1a8ed16 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -939,15 +939,15 @@ rust_get_global_data_ptr() {
 }
 
 extern "C" void
-rust_inc_weak_task_count() {
+rust_inc_kernel_live_count() {
     rust_task *task = rust_get_current_task();
-    task->kernel->inc_weak_task_count();
+    task->kernel->inc_live_count();
 }
 
 extern "C" void
-rust_dec_weak_task_count() {
+rust_dec_kernel_live_count() {
     rust_task *task = rust_get_current_task();
-    task->kernel->dec_weak_task_count();
+    task->kernel->dec_live_count();
 }
 
 //