diff options
| author | Jon Morton <jonanin@gmail.com> | 2012-04-03 04:37:00 -0500 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-04-03 16:02:38 -0700 |
| commit | 386069f39ea17c594e86675fa00d878a6455137f (patch) | |
| tree | 63ec677f0c2de822971f343441b71d01dd161f2f /src/rt/rust_kernel.h | |
| parent | 632a4c9326561de2bd9d9ded19a82f22678a0cf4 (diff) | |
| download | rust-386069f39ea17c594e86675fa00d878a6455137f.tar.gz rust-386069f39ea17c594e86675fa00d878a6455137f.zip | |
actually remove memory.h; include cleanups
Diffstat (limited to 'src/rt/rust_kernel.h')
| -rw-r--r-- | src/rt/rust_kernel.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/rt/rust_kernel.h b/src/rt/rust_kernel.h index 3683773a7fb..ec7a5876ad9 100644 --- a/src/rt/rust_kernel.h +++ b/src/rt/rust_kernel.h @@ -89,17 +89,13 @@ public: template <typename T> struct kernel_owned { inline void *operator new(size_t size, rust_kernel *kernel, - const char *tag); + const char *tag) { + return kernel->malloc(size, tag); + } void operator delete(void *ptr) { ((T *)ptr)->kernel->free(ptr); } }; -template <typename T> -inline void *kernel_owned<T>::operator new(size_t size, rust_kernel *kernel, - const char *tag) { - return kernel->malloc(size, tag); -} - #endif /* RUST_KERNEL_H */ |