Skip to content

Commit

Permalink
auto merge of #6025 : alexcrichton/rust/issue-2697, r=catamorphism
Browse files Browse the repository at this point in the history
Closes #2697

I guess all of the uses weren't around any more, because everything continued to compile (at least on OSX). If bors doesn't like it for another platform I can try to track it down as well.
  • Loading branch information
bors committed Apr 23, 2013
2 parents 54b0cbf + 391de1c commit 212256b
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/rt/rust_task.h
Original file line number Diff line number Diff line change
Expand Up @@ -396,12 +396,6 @@ rust_task : public kernel_owned<rust_task>
void allow_yield();
};

// FIXME (#2697): It would be really nice to be able to get rid of this.
inline void *operator new[](size_t size, rust_task *task, const char *tag) {
return task->malloc(size, tag);
}


template <typename T> struct task_owned {
inline void *operator new(size_t size, rust_task *task,
const char *tag) {
Expand Down

0 comments on commit 212256b

Please sign in to comment.