summaryrefslogtreecommitdiff
path: root/src/mem/ruby/common/SubBlock.hh
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2010-06-10 23:17:07 -0700
committerNathan Binkert <nate@binkert.org>2010-06-10 23:17:07 -0700
commit006818aeea6176c4500c5f7414e9f2a822c77062 (patch)
tree74adbd6cc14951943bd6eafc4aba2fb98be7a526 /src/mem/ruby/common/SubBlock.hh
parentbc87fa30d72df7db6265be50b2c39dc218076f9f (diff)
downloadgem5-006818aeea6176c4500c5f7414e9f2a822c77062.tar.xz
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
Diffstat (limited to 'src/mem/ruby/common/SubBlock.hh')
-rw-r--r--src/mem/ruby/common/SubBlock.hh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh
index 571d45b57..3ebc99630 100644
--- a/src/mem/ruby/common/SubBlock.hh
+++ b/src/mem/ruby/common/SubBlock.hh
@@ -30,8 +30,8 @@
#define __MEM_RUBY_COMMON_SUBBLOCK_HH__
#include <iostream>
+#include <vector>
-#include "mem/gems_common/Vector.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/common/DataBlock.hh"
#include "mem/ruby/common/Global.hh"
@@ -47,7 +47,7 @@ class SubBlock
void setAddress(const Address& addr) { m_address = addr; }
int getSize() const { return m_data.size(); }
- void setSize(int size) { m_data.setSize(size); }
+ void resize(int size) { m_data.resize(size); }
uint8 getByte(int offset) const { return m_data[offset]; }
void setByte(int offset, uint8 data) { m_data[offset] = data; }
@@ -68,7 +68,7 @@ class SubBlock
// Data Members (m_ prefix)
Address m_address;
- Vector<uint8_t> m_data;
+ std::vector<uint8_t> m_data;
};
inline std::ostream&