44c44
< SubBlock::mergeFrom(const DataBlock& data)
---
> SubBlock::internalMergeFrom(const DataBlock& data)
55c55
< SubBlock::mergeTo(DataBlock& data) const
---
> SubBlock::internalMergeTo(DataBlock& data) const
70a71,73
>
>
>