diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-05-06 12:10:16 -0400 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-05-06 12:10:16 -0400 |
| commit | 1a90fecc24df015e9bce1dafd3ea6993cd6cd6f6 (patch) | |
| tree | 560f1973efb141c2da4d946f73c80010f9f0895c | |
| parent | 51e4d64551fafe8dcf698c64da96f4efa96fb5e1 (diff) | |
| parent | 24715f50ac2f8e2473d5d8d2c0ad7a8346fecaa1 (diff) | |
| download | gem5-1a90fecc24df015e9bce1dafd3ea6993cd6cd6f6.tar.xz | |
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest
--HG--
extra : convert_revision : 12234085865daa71e32981177d3376c93b3ed11e
| -rw-r--r-- | base/trace.hh | 2 | ||||
| -rw-r--r-- | base/traceflags.py | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/base/trace.hh b/base/trace.hh index e49d7aa61..948bff548 100644 --- a/base/trace.hh +++ b/base/trace.hh @@ -43,7 +43,7 @@ #endif #endif -#include "base/trace_flags.hh" +#include "base/traceflags.hh" namespace Trace { diff --git a/base/traceflags.py b/base/traceflags.py index 79a54445e..b7b7fa777 100644 --- a/base/traceflags.py +++ b/base/traceflags.py @@ -134,11 +134,7 @@ import sys # extract just the compound flag names into a list compoundFlags = [] compoundFlags.extend(compoundFlagMap.keys()) -#for flags in compoundFlagMap.keys(): -# compoundFlags.append(flags) -print 'compound', compoundFlags compoundFlags.sort() -print 'compound', compoundFlags # # First generate the header file. This defines the Flag enum @@ -288,7 +284,7 @@ print >>ccfile, '''\ * Automatically generated from traceflags.pl. */ -#include "base/trace_flags.hh" +#include "base/traceflags.hh" using namespace Trace; |