Skip to content

Commit 212256b

Browse files
committed
auto merge of #6025 : alexcrichton/rust/issue-2697, r=catamorphism
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.
2 parents 54b0cbf + 391de1c commit 212256b

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/rt/rust_task.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,12 +396,6 @@ rust_task : public kernel_owned<rust_task>
396396
void allow_yield();
397397
};
398398

399-
// FIXME (#2697): It would be really nice to be able to get rid of this.
400-
inline void *operator new[](size_t size, rust_task *task, const char *tag) {
401-
return task->malloc(size, tag);
402-
}
403-
404-
405399
template <typename T> struct task_owned {
406400
inline void *operator new(size_t size, rust_task *task,
407401
const char *tag) {

0 commit comments

Comments
 (0)