75c75
< typedef typename Impl::FullCPU FullCPU;
---
> typedef typename Impl::O3CPU O3CPU;
281c281
< FullCPU *cpu;
---
> O3CPU *cpu;
285c285
< void setCPU(FullCPU *cpu_ptr) { cpu = cpu_ptr; }
---
> void setCPU(O3CPU *cpu_ptr) { cpu = cpu_ptr; }