From 386069f39ea17c594e86675fa00d878a6455137f Mon Sep 17 00:00:00 2001
From: Jon Morton <jonanin@gmail.com>
Date: Tue, 3 Apr 2012 04:37:00 -0500
Subject: [PATCH] actually remove memory.h; include cleanups

---
 src/rt/memory.h           |  9 ---------
 src/rt/rust_kernel.h      | 10 +++-------
 src/rt/rust_refcount.h    |  2 --
 src/rt/rust_scheduler.cpp |  2 +-
 src/rt/rust_task.h        |  1 -
 src/rt/rust_upcall.cpp    |  1 -
 6 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 src/rt/memory.h

diff --git a/src/rt/memory.h b/src/rt/memory.h
deleted file mode 100644
index 16662fd7a14..00000000000
--- a/src/rt/memory.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- c++ -*-
-#ifndef MEMORY_H
-#define MEMORY_H
-
-#include "rust_task.h"
-
-
-
-#endif /* MEMORY_H */
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 */
diff --git a/src/rt/rust_refcount.h b/src/rt/rust_refcount.h
index 0e70af31aff..b8067cf6941 100644
--- a/src/rt/rust_refcount.h
+++ b/src/rt/rust_refcount.h
@@ -26,6 +26,4 @@ public:                                                                    \
    void deref() { if(0 == sync::decrement(ref_count)) { delete_this(); } } \
    intptr_t get_ref_count() { return sync::read(ref_count); }
 
-
-
 #endif
diff --git a/src/rt/rust_scheduler.cpp b/src/rt/rust_scheduler.cpp
index acf5dfcbe88..af52b48f985 100644
--- a/src/rt/rust_scheduler.cpp
+++ b/src/rt/rust_scheduler.cpp
@@ -1,7 +1,7 @@
 
+#include "rust_globals.h"
 #include "rust_scheduler.h"
 #include "rust_task.h"
-#include "rust_globals.h"
 #include "rust_util.h"
 #include "rust_sched_launcher.h"
 
diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h
index 2a6ed8fdd44..54362e28450 100644
--- a/src/rt/rust_task.h
+++ b/src/rt/rust_task.h
@@ -13,7 +13,6 @@
 #include "rust_port_selector.h"
 #include "rust_type.h"
 #include "rust_sched_loop.h"
-#include "memory.h"
 
 // The amount of extra space at the end of each stack segment, available
 // to the rt, compiler and dynamic linker for running small functions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index a257c031cc0..4753850ca59 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -13,7 +13,6 @@
 #include "rust_unwind.h"
 #include "rust_upcall.h"
 #include "rust_util.h"
-#include <stdint.h>
 
 #ifdef __GNUC__
 #define LOG_UPCALL_ENTRY(task)                            \