summaryrefslogtreecommitdiff
path: root/src/cpu/testers/rubytest/Check.cc
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:41 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2014-09-01 16:55:41 -0500
commitcc2cc588693bb73b1892aea82fd0ac9729196f25 (patch)
tree29056c28b5492831634fcab6692e94ffe66af3eb /src/cpu/testers/rubytest/Check.cc
parent82d136285dac52a97384961a814d5a0dda4a6482 (diff)
downloadgem5-cc2cc588693bb73b1892aea82fd0ac9729196f25.tar.xz
ruby: eliminate type Time
There is another type Time in src/base class which results in a conflict.
Diffstat (limited to 'src/cpu/testers/rubytest/Check.cc')
-rw-r--r--src/cpu/testers/rubytest/Check.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc
index ae74da67f..b2b679018 100644
--- a/src/cpu/testers/rubytest/Check.cc
+++ b/src/cpu/testers/rubytest/Check.cc
@@ -266,7 +266,7 @@ Check::initiateCheck()
}
void
-Check::performCallback(NodeID proc, SubBlock* data, Time curTime)
+Check::performCallback(NodeID proc, SubBlock* data, Cycles curTime)
{
Address address = data->getAddress();