diff --git a/src/rt/memory.h b/src/rt/memory.h index a42795c8b64b..5bcc5ea9df82 100644 --- a/src/rt/memory.h +++ b/src/rt/memory.h @@ -2,13 +2,6 @@ #ifndef MEMORY_H #define MEMORY_H -#if 0 -inline void operator delete(void *mem, rust_task *task) { - task->free(mem); - return; -} -#endif - // FIXME: It would be really nice to be able to get rid of this. inline void *operator new[](size_t size, rust_task *task) { return task->malloc(size); diff --git a/src/rt/rust_chan.cpp b/src/rt/rust_chan.cpp index 141d60a3e9c1..99d06f6265f2 100644 --- a/src/rt/rust_chan.cpp +++ b/src/rt/rust_chan.cpp @@ -88,7 +88,7 @@ void rust_chan::send(void *sptr) { buffer.dequeue(NULL); } else { rust_port *target_port = port->referent(); - scoped_lock right(target_port->lock); + scoped_lock with(target_port->lock); if (target_port->task->blocked_on(target_port)) { DLOG(sched, comm, "dequeued in rendezvous_ptr"); buffer.dequeue(target_port->task->rendezvous_ptr);