summaryrefslogtreecommitdiff
path: root/base/fast_alloc.hh
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-12-15 21:07:04 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2003-12-15 21:07:04 -0800
commitf47dcadfd8b50e97b51c05b72f19063b39686a7c (patch)
tree5b05ef12c1d674d841b45cfa65dae415b7e9449f /base/fast_alloc.hh
parentce4aba3e54eb69b0902c75de2db1810ed7dcfe6b (diff)
parent2cd5e980d2e7b33d61b5a5639784b424fa74142a (diff)
downloadgem5-f47dcadfd8b50e97b51c05b72f19063b39686a7c.tar.xz
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG-- extra : convert_revision : dd887635c7ce74324b3670744461ffdf92e1dedf
Diffstat (limited to 'base/fast_alloc.hh')
-rw-r--r--base/fast_alloc.hh9
1 files changed, 9 insertions, 0 deletions
diff --git a/base/fast_alloc.hh b/base/fast_alloc.hh
index 7d699abd1..81f2f1359 100644
--- a/base/fast_alloc.hh
+++ b/base/fast_alloc.hh
@@ -68,6 +68,13 @@
// (by bucket).
// #define FAST_ALLOC_STATS
+#ifdef NO_FAST_ALLOC
+
+class FastAlloc {
+};
+
+#else
+
class FastAlloc {
public:
@@ -200,4 +207,6 @@ void FastAlloc::operator delete(void *p, size_t sz)
deallocate(p, sz);
}
+#endif // NO_FAST_ALLOC
+
#endif // __FAST_ALLOC_H__