Merge zizzer:/bk/multiarch

[gem5.git] / base / trace.hh

diff --git a/base/trace.hh b/base/trace.hh
index 054b145461617d625f23eefe9336c0d7c44cdcaa..5e14f1bfff7ce354217f1d741a4e164d12cc48d3 100644 (file)
--- a/base/trace.hh
+++ b/base/trace.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2004 The Regents of The University of Michigan
+ * Copyright (c) 2001-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
 #include "base/cprintf.hh"
 #include "base/match.hh"
 #include "sim/host.hh"
-#include "sim/universe.hh"
+#include "sim/root.hh"
 
 #ifndef TRACING_ON
 #ifndef NDEBUG
@@ -203,7 +203,7 @@ do { \
 #define DPRINTFR(x, args...) \
 do { \
     if (Trace::IsOn(Trace::x)) \
-        __dprintf((Tick)-1, string(), args, cp::ArgListNull()); \
+        __dprintf((Tick)-1, std::string(), args, cp::ArgListNull());   \
 } while (0)
 
 #define DPRINTFN(args...) \