1a2,13
> * Copyright (c) 2013 ARM Limited
> * All rights reserved
> *
> * The license below extends only to copyright in the software and shall
> * not be construed as granting a license to any other intellectual
> * property including but not limited to intellectual property relating
> * to a hardware implementation of the functionality of the software
> * licensed hereunder. You may use the software subject to the license
> * terms below provided that you ensure that this notice is replicated
> * unmodified and in its entirety in all distributions of the software,
> * modified or unmodified, in source code or in binary form.
> *
72,73c84
< SubBlock* subBlock;
< Packet::SenderState *saved;
---
> SubBlock subBlock;
75,80c86
< SenderState(Address addr, int size,
< Packet::SenderState *sender_state = NULL)
< : saved(sender_state)
< {
< subBlock = new SubBlock(addr, size);
< }
---
> SenderState(Address addr, int size) : subBlock(addr, size) {}
82,85d87
< ~SenderState()
< {
< delete subBlock;
< }