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.hh | |
| 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.hh')
| -rw-r--r-- | src/cpu/testers/rubytest/RubyTester.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh index df1bc1fbb..e1b829a7d 100644 --- a/src/cpu/testers/rubytest/RubyTester.hh +++ b/src/cpu/testers/rubytest/RubyTester.hh @@ -141,7 +141,7 @@ class RubyTester : public MemObject RubyTester& operator=(const RubyTester& obj); CheckTable* m_checkTable_ptr; - std::vector<Time> m_last_progress_vector; + std::vector<Cycles> m_last_progress_vector; int m_num_cpus; uint64 m_checks_completed; |