53c53,54
< #include <list>
---
> #include <memory>
> #include <vector>
89a91,96
>
> /** The cache blocks. */
> std::vector<BlkType> blks;
> /** The data blocks, 1 per cache block. */
> std::unique_ptr<uint8_t[]> dataBlks;
>
91a99
>
96c104
< SetType *sets;
---
> std::vector<SetType> sets;
98,102d105
< /** The cache blocks. */
< BlkType *blks;
< /** The data blocks, 1 per cache block. */
< uint8_t *dataBlks;
<
123c126
< virtual ~BaseSetAssoc();
---
> virtual ~BaseSetAssoc() {};