From cc2cc588693bb73b1892aea82fd0ac9729196f25 Mon Sep 17 00:00:00 2001 From: Nilay Vaish 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 +- src/mem/ruby/profiler/StoreTrace.hh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/mem/ruby/profiler') 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); diff --git a/src/mem/ruby/profiler/StoreTrace.hh b/src/mem/ruby/profiler/StoreTrace.hh index 293871723..ac38a420b 100644 --- a/src/mem/ruby/profiler/StoreTrace.hh +++ b/src/mem/ruby/profiler/StoreTrace.hh @@ -31,6 +31,7 @@ #include +#include "base/types.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Histogram.hh" @@ -61,8 +62,8 @@ class StoreTrace Address m_addr; NodeID m_last_writer; - Time m_first_store; - Time m_last_store; + Tick m_first_store; + Tick m_last_store; int m_stores_this_interval; int64 m_total_samples; // Total number of store lifetimes of this line -- cgit v1.2.3