diff options
Diffstat (limited to 'src/mem/ruby/common/SubBlock.cc')
| -rw-r--r-- | src/mem/ruby/common/SubBlock.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc index 5175cb950..f1839df72 100644 --- a/src/mem/ruby/common/SubBlock.cc +++ b/src/mem/ruby/common/SubBlock.cc @@ -41,7 +41,7 @@ SubBlock::SubBlock(Addr addr, int size) } void -SubBlock::internalMergeFrom(const DataBlock& data) +SubBlock::mergeFrom(const DataBlock& data) { int size = getSize(); assert(size > 0); @@ -52,7 +52,7 @@ SubBlock::internalMergeFrom(const DataBlock& data) } void -SubBlock::internalMergeTo(DataBlock& data) const +SubBlock::mergeTo(DataBlock& data) const { int size = getSize(); assert(size > 0); @@ -68,6 +68,3 @@ SubBlock::print(std::ostream& out) const { out << "[" << m_address << ", " << getSize() << ", " << m_data << "]"; } - - - |