From 006818aeea6176c4500c5f7414e9f2a822c77062 Mon Sep 17 00:00:00 2001 From: Nathan Binkert 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/mem/ruby/common/SubBlock.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mem/ruby/common/SubBlock.hh') 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 +#include -#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 m_data; + std::vector m_data; }; inline std::ostream& -- cgit v1.2.3