ruby: get rid of Vector and use STL

add a couple of helper functions to base for deleteing all pointers in
a container and outputting containers to a stream

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
index ea8f7789b..d41c3d4ee 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.cc
@@ -28,10 +28,12 @@
  * Authors: Niket Agarwal
  */
 
+#include "base/stl_helpers.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/InputUnit_d.hh"
 #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
 
 using namespace std;
+using m5::stl_helpers::deletePointers;
 
 InputUnit_d::InputUnit_d(int id, Router_d *router)
 {
@@ -44,7 +46,7 @@ InputUnit_d::InputUnit_d(int id, Router_d *router)
 
         creditQueue = new flitBuffer_d();
         // Instantiating the virtual channels
-        m_vcs.setSize(m_num_vcs);
+        m_vcs.resize(m_num_vcs);
         for(int i=0; i < m_num_vcs; i++)
         {
                 m_vcs[i] = new VirtualChannel_d(i);
@@ -54,7 +56,7 @@ InputUnit_d::InputUnit_d(int id, Router_d *router)
 InputUnit_d::~InputUnit_d()
 {
         delete creditQueue;
-        m_vcs.deletePointers();
+        deletePointers(m_vcs);
 }
 
 void InputUnit_d::wakeup()