28a29,31
> #include <numeric>
>
> #include "base/stl_helpers.hh"
37a41,42
> using m5::stl_helpers::deletePointers;
> using m5::stl_helpers::operator<<;
43d47
< m_throttles.setSize(0);
51c55
< m_throttles.deletePointers();
---
> deletePointers(m_throttles);
54c58
< m_buffers_to_free.deletePointers();
---
> deletePointers(m_buffers_to_free);
58c62
< Switch::addInPort(const Vector<MessageBuffer*>& in)
---
> Switch::addInPort(const vector<MessageBuffer*>& in)
64c68
< Switch::addOutPort(const Vector<MessageBuffer*>& out,
---
> Switch::addOutPort(const vector<MessageBuffer*>& out,
72c76
< m_throttles.insertAtBottom(throttle_ptr);
---
> m_throttles.push_back(throttle_ptr);
75c79
< Vector<MessageBuffer*> intermediateBuffers;
---
> vector<MessageBuffer*> intermediateBuffers;
82c86
< buffer_ptr->setSize(net_ptr->getBufferSize());
---
> buffer_ptr->resize(net_ptr->getBufferSize());
84,85c88,89
< intermediateBuffers.insertAtBottom(buffer_ptr);
< m_buffers_to_free.insertAtBottom(buffer_ptr);
---
> intermediateBuffers.push_back(buffer_ptr);
> m_buffers_to_free.push_back(buffer_ptr);
125c129
< const Vector<Throttle*>*
---
> const vector<Throttle*>*
175c179
< const Vector<Vector<int> >& message_counts =
---
> const vector<vector<int> >& message_counts =
179c183,184
< int sum = message_counts[type].sum();
---
> const vector<int> &mct = message_counts[type];
> int sum = accumulate(mct.begin(), mct.end(), 0);
186c191,193
< << " " << message_counts[type] << " base_latency: "
---
> << " ";
> out << mct;
> out << " base_latency: "