about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-07-27 12:05:15 -0700
committerBrian Anderson <banderson@mozilla.com>2013-07-30 14:23:44 -0700
commit0144c83213cb5ce43df61f149274379f49b6d7cb (patch)
treeaa4a8117325521e49c07bb1e5a679bad6f9827db /src/rt/rust_builtin.cpp
parent7265cc6530b242f9590a3207f2bfdf9a5425a32c (diff)
downloadrust-0144c83213cb5ce43df61f149274379f49b6d7cb.tar.gz
rust-0144c83213cb5ce43df61f149274379f49b6d7cb.zip
std::rt: Change Thread interface to require an explicit join
Makes it more obvious what's going on
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 06b09bcedd2..bcf5575cede 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -751,9 +751,14 @@ rust_raw_thread_start(fn_env_pair *fn) {
 }
 
 extern "C" void
-rust_raw_thread_join_delete(raw_thread *thread) {
+rust_raw_thread_join(raw_thread *thread) {
     assert(thread);
     thread->join();
+}
+
+extern "C" void
+rust_raw_thread_delete(raw_thread *thread) {
+    assert(thread);
     delete thread;
 }