From cc2cc588693bb73b1892aea82fd0ac9729196f25 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 1 Sep 2014 16:55:41 -0500
Subject: ruby: eliminate type Time There is another type Time in src/base
 class which results in a conflict.

---
 src/mem/ruby/profiler/StoreTrace.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mem/ruby/profiler/StoreTrace.cc')

diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc
index 84b05ea86..1c462dd25 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -127,7 +127,7 @@ void
 StoreTrace::downgrade(NodeID node)
 {
     if (node == m_last_writer) {
-        Time current = curTick();
+        Tick current = curTick();
         assert(m_stores_this_interval != 0);
         assert(m_last_store != 0);
         assert(m_first_store != 0);
-- 
cgit v1.2.3