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/cpu/testers/rubytest/Check.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/cpu/testers/rubytest/Check.hh')

diff --git a/src/cpu/testers/rubytest/Check.hh b/src/cpu/testers/rubytest/Check.hh
index 47d790b1e..3e8061ee7 100644
--- a/src/cpu/testers/rubytest/Check.hh
+++ b/src/cpu/testers/rubytest/Check.hh
@@ -50,7 +50,7 @@ class Check
           int _num_readers, RubyTester* _tester);
 
     void initiate(); // Does Action or Check or nether
-    void performCallback(NodeID proc, SubBlock* data, Time curTime);
+    void performCallback(NodeID proc, SubBlock* data, Cycles curTime);
     const Address& getAddress() { return m_address; }
     void changeAddress(const Address& address);
 
-- 
cgit v1.2.3