ruby: message buffer: removes some unecessary functions.

[gem5.git] / src / base / cp_annotate.hh

diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh
index 8ce9995a8574539b028c0509b33e3f7d30a95c0f..3e4597ba8da861f7b9cbef1914b35e35eb2a17dc 100644 (file)
--- a/src/base/cp_annotate.hh
+++ b/src/base/cp_annotate.hh
@@ -31,13 +31,13 @@
 #ifndef __BASE__CP_ANNOTATE_HH__
 #define __BASE__CP_ANNOTATE_HH__
 
-#include <string>
 #include <list>
-#include <vector>
 #include <map>
+#include <string>
+#include <vector>
 
-#include "base/hashmap.hh"
 #include "base/loader/symtab.hh"
+#include "base/hashmap.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
 #include "config/cp_annotate.hh"
@@ -408,7 +408,7 @@ class CPA : SimObject
         int smi = getSm(sysi, sm, frame);
         add(OP_BEGIN, FL_HW | f, 0, smi, getSt(sm, st));
         if (f & FL_BAD)
-            warn("BAD state encountered: at cycle %d: %s\n", curTick, st);
+            warn("BAD state encountered: at cycle %d: %s\n", curTick(), st);
     }
 
     inline void hwQ(flags f, System *sys, uint64_t frame, std::string sm,