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/system/CacheRecorder.hh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mem/ruby/system/CacheRecorder.hh') diff --git a/src/mem/ruby/system/CacheRecorder.hh b/src/mem/ruby/system/CacheRecorder.hh index 2156b0689..ad1223dce 100644 --- a/src/mem/ruby/system/CacheRecorder.hh +++ b/src/mem/ruby/system/CacheRecorder.hh @@ -38,6 +38,7 @@ #include #include "base/hashmap.hh" +#include "base/types.hh" #include "mem/protocol/RubyRequestType.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/DataBlock.hh" @@ -54,7 +55,7 @@ class Sequencer; class TraceRecord { public: int m_cntrl_id; - Time m_time; + Tick m_time; physical_address_t m_data_address; physical_address_t m_pc_address; RubyRequestType m_type; @@ -75,7 +76,7 @@ class CacheRecorder uint64_t block_size_bytes); void addRecord(int cntrl, const physical_address_t data_addr, const physical_address_t pc_addr, RubyRequestType type, - Time time, DataBlock& data); + Tick time, DataBlock& data); uint64 aggregateRecords(uint8_t** data, uint64 size); -- cgit v1.2.3