diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
| commit | 1e7a744c09d0bde70e0f83179fdf4d6059585e4b (patch) | |
| tree | 9bbc7713c4bb79abb3f76b07547d8822f0557caa /base/trace.hh | |
| parent | c389c2e327cc3ee1c988855b05505660c6670172 (diff) | |
| parent | b78d7c2f16dac11ed468de45a088a362605c6493 (diff) | |
| download | gem5-1e7a744c09d0bde70e0f83179fdf4d6059585e4b.tar.xz | |
Hand merge
--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b
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__ |