diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-14 12:23:47 -0700 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-14 12:23:47 -0700 |
commit | 288f9cf7d24d506a0776405000e04ede6fa38384 (patch) | |
tree | 4de3e459d00cc6f1985279128674b2d1ba211fd3 /src/base | |
parent | a51e16dc89ecd24b168fbb4677ca05ab0a7bcc02 (diff) | |
parent | e5ecfa27455a8be97429e9f88e8e6582b9819c6f (diff) | |
download | gem5-288f9cf7d24d506a0776405000e04ede6fa38384.tar.xz |
Merge from head.
--HG--
extra : convert_revision : f7b3700762b796d44f99aef05783db1ee9c7412e
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/fast_alloc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/base/fast_alloc.cc b/src/base/fast_alloc.cc index 610dff66c..e1298a8bd 100644 --- a/src/base/fast_alloc.cc +++ b/src/base/fast_alloc.cc @@ -34,15 +34,15 @@ * by permission. */ -#ifndef NO_FAST_ALLOC +#include <assert.h> +#include "base/fast_alloc.hh" + +#if !NO_FAST_ALLOC #ifdef __GNUC__ #pragma implementation #endif -#include <assert.h> -#include "base/fast_alloc.hh" - void *FastAlloc::freeLists[Num_Buckets]; #ifdef FAST_ALLOC_STATS |