diff options
Diffstat (limited to 'src/mem/ruby/common/SubBlock.hh')
-rw-r--r-- | src/mem/ruby/common/SubBlock.hh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh index ad1d68ae1..f336328fa 100644 --- a/src/mem/ruby/common/SubBlock.hh +++ b/src/mem/ruby/common/SubBlock.hh @@ -56,15 +56,12 @@ class SubBlock // Merging to and from DataBlocks - We only need to worry about // updates when we are using DataBlocks - void mergeTo(DataBlock& data) const { internalMergeTo(data); } - void mergeFrom(const DataBlock& data) { internalMergeFrom(data); } + void mergeTo(DataBlock& data) const; + void mergeFrom(const DataBlock& data); void print(std::ostream& out) const; private: - void internalMergeTo(DataBlock& data) const; - void internalMergeFrom(const DataBlock& data); - // Data Members (m_ prefix) Addr m_address; std::vector<uint8_t> m_data; |