diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:41 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-09-01 16:55:41 -0500 |
| commit | cc2cc588693bb73b1892aea82fd0ac9729196f25 (patch) | |
| tree | 29056c28b5492831634fcab6692e94ffe66af3eb /src/cpu/testers/rubytest/RubyTester.cc | |
| parent | 82d136285dac52a97384961a814d5a0dda4a6482 (diff) | |
| download | gem5-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/RubyTester.cc')
| -rw-r--r-- | src/cpu/testers/rubytest/RubyTester.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc index 68f76f1a6..229b3e0a9 100644 --- a/src/cpu/testers/rubytest/RubyTester.cc +++ b/src/cpu/testers/rubytest/RubyTester.cc @@ -102,7 +102,7 @@ RubyTester::init() m_last_progress_vector.resize(m_num_cpus); for (int i = 0; i < m_last_progress_vector.size(); i++) { - m_last_progress_vector[i] = 0; + m_last_progress_vector[i] = Cycles(0); } m_num_writers = writePorts.size(); @@ -225,7 +225,7 @@ void RubyTester::checkForDeadlock() { int size = m_last_progress_vector.size(); - Time current_time = curCycle(); + Cycles current_time = curCycle(); for (int processor = 0; processor < size; processor++) { if ((current_time - m_last_progress_vector[processor]) > m_deadlock_threshold) { |