about summary refs log tree commit diff
path: root/src/rt/rust_builtin.cpp
diff options
context:
space:
mode:
authorEric Holk <eholk@mozilla.com>2011-07-29 18:52:16 -0700
committerEric Holk <eholk@mozilla.com>2011-08-01 15:58:30 -0700
commitb3d9d9b73cb9cae6b76e0a040756784112ed88a9 (patch)
treef28ccfdb78e36fdec04781da31ddb6d207b2410e /src/rt/rust_builtin.cpp
parent5a673cc2c9d1a85efb967c47e40cb805ba691b90 (diff)
downloadrust-b3d9d9b73cb9cae6b76e0a040756784112ed88a9.tar.gz
rust-b3d9d9b73cb9cae6b76e0a040756784112ed88a9.zip
Objectified library chans and ports.
Diffstat (limited to 'src/rt/rust_builtin.cpp')
-rw-r--r--src/rt/rust_builtin.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index 143a0b22f73..989e0a4800a 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -912,7 +912,6 @@ void drop_chan(rust_task *task, rust_chan *chan) {
 extern "C" CDECL
 void drop_port(rust_task *, rust_port *port) {
     port->ref_count--;
->>>>>>> Started working on a library-based comm system. Creating and deleting ports work.
 }
 
 //