diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-09 12:56:24 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-09 12:56:24 -0500 |
| commit | 230a5a608dfb2204e2886a795e6bd8a30224b84f (patch) | |
| tree | 81d312257237c4d13ad44836d55d2f192a479036 /base/trace.hh | |
| parent | d9317dd348f3acd853d1e6a09c09f2a27ad5d707 (diff) | |
| parent | c4089562d5add225cd8275b59456eb7eb559b988 (diff) | |
| download | gem5-230a5a608dfb2204e2886a795e6bd8a30224b84f.tar.xz | |
Merger
cpu/simple_cpu/simple_cpu.hh:
Merge
--HG--
extra : convert_revision : 1b6003ac731051fefacb7d7a30c317553b4bf1bc
Diffstat (limited to 'base/trace.hh')
| -rw-r--r-- | base/trace.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/trace.hh b/base/trace.hh index 5e05d6e5e..054b14546 100644 --- a/base/trace.hh +++ b/base/trace.hh @@ -26,8 +26,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __TRACE_HH__ -#define __TRACE_HH__ +#ifndef __BASE_TRACE_HH__ +#define __BASE_TRACE_HH__ #include <vector> @@ -228,4 +228,4 @@ do { \ #endif // TRACING_ON -#endif // __TRACE_HH__ +#endif // __BASE_TRACE_HH__ |