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/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.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/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh')
-rw-r--r-- | src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh index 0b8b9f12f..05142cd28 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh @@ -86,7 +86,7 @@ class NetworkInterface_d : public ClockedObject, public Consumer // Input Flit Buffers // The flit buffers which will serve the Consumer std::vector<flitBuffer_d *> m_ni_buffers; - std::vector<Time> m_ni_enqueue_time; + std::vector<Cycles> m_ni_enqueue_time; // The Message buffers that takes messages from the protocol std::vector<MessageBuffer *> inNode_ptr; |