From cc2cc588693bb73b1892aea82fd0ac9729196f25 Mon Sep 17 00:00:00 2001 From: Nilay Vaish 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/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 4 ++-- src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mem/ruby/network') diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc index 5f9493806..db71c9974 100644 --- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc +++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc @@ -60,7 +60,7 @@ NetworkInterface_d::NetworkInterface_d(const Params *p) // instantiating the NI flit buffers for (int i = 0; i < m_num_vcs; i++) { m_ni_buffers[i] = new flitBuffer_d(); - m_ni_enqueue_time[i] = INFINITE_; + m_ni_enqueue_time[i] = Cycles(INFINITE_); } m_vc_allocator.resize(m_virtual_networks); // 1 allocator per vnet @@ -330,7 +330,7 @@ NetworkInterface_d::scheduleOutputLink() if (t_flit->get_type() == TAIL_ || t_flit->get_type() == HEAD_TAIL_) { - m_ni_enqueue_time[vc] = INFINITE_; + m_ni_enqueue_time[vc] = Cycles(INFINITE_); } return; } 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 m_ni_buffers; - std::vector