From 006818aeea6176c4500c5f7414e9f2a822c77062 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Thu, 10 Jun 2010 23:17:07 -0700
Subject: 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

---
 src/cpu/rubytest/CheckTable.cc | 2 +-
 src/cpu/rubytest/CheckTable.hh | 4 ++--
 src/cpu/rubytest/RubyTester.cc | 2 +-
 src/cpu/rubytest/RubyTester.hh | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/cpu/rubytest')

diff --git a/src/cpu/rubytest/CheckTable.cc b/src/cpu/rubytest/CheckTable.cc
index 3b94de315..7588007c9 100644
--- a/src/cpu/rubytest/CheckTable.cc
+++ b/src/cpu/rubytest/CheckTable.cc
@@ -102,7 +102,7 @@ CheckTable::addCheck(const Address& address)
         // Insert it once per byte
         m_lookup_map_ptr->add(Address(address.getAddress() + i), check_ptr);
     }
-    m_check_vector.insertAtBottom(check_ptr);
+    m_check_vector.push_back(check_ptr);
 }
 
 Check*
diff --git a/src/cpu/rubytest/CheckTable.hh b/src/cpu/rubytest/CheckTable.hh
index a22fa7f73..117fb1276 100644
--- a/src/cpu/rubytest/CheckTable.hh
+++ b/src/cpu/rubytest/CheckTable.hh
@@ -31,8 +31,8 @@
 #define __CPU_RUBYTEST_CHECKTABLE_HH__
 
 #include <iostream>
+#include <vector>
 
-#include "mem/gems_common/Vector.hh"
 #include "mem/ruby/common/Global.hh"
 
 class Address;
@@ -63,7 +63,7 @@ class CheckTable
     CheckTable(const CheckTable& obj);
     CheckTable& operator=(const CheckTable& obj);
 
-    Vector<Check*> m_check_vector;
+    std::vector<Check*> m_check_vector;
     Map<Address, Check*>* m_lookup_map_ptr;
 
     int m_num_cpu_sequencers;
diff --git a/src/cpu/rubytest/RubyTester.cc b/src/cpu/rubytest/RubyTester.cc
index 3ad977b42..036e511bc 100644
--- a/src/cpu/rubytest/RubyTester.cc
+++ b/src/cpu/rubytest/RubyTester.cc
@@ -59,7 +59,7 @@ RubyTester::init()
 {
     assert(ports.size() > 0);
 
-    m_last_progress_vector.setSize(ports.size());
+    m_last_progress_vector.resize(ports.size());
     for (int i = 0; i < m_last_progress_vector.size(); i++) {
         m_last_progress_vector[i] = 0;
     }
diff --git a/src/cpu/rubytest/RubyTester.hh b/src/cpu/rubytest/RubyTester.hh
index 634e61f88..2726a50d6 100644
--- a/src/cpu/rubytest/RubyTester.hh
+++ b/src/cpu/rubytest/RubyTester.hh
@@ -31,6 +31,7 @@
 #define __CPU_RUBYTEST_RUBYTESTER_HH__
 
 #include <iostream>
+#include <vector>
 #include <string>
 
 #include "cpu/rubytest/CheckTable.hh"
@@ -126,7 +127,7 @@ class RubyTester : public MemObject
     RubyTester& operator=(const RubyTester& obj);
 
     CheckTable* m_checkTable_ptr;
-    Vector<Time> m_last_progress_vector;
+    std::vector<Time> m_last_progress_vector;
 
     uint64 m_checks_completed;
     std::vector<CpuPort*> ports;
-- 
cgit v1.2.3