71c71
< typedef typename Impl::FullCPU FullCPU;
---
> typedef typename Impl::O3CPU O3CPU;
149c149
< void setCPU(FullCPU *cpu_ptr);
---
> void setCPU(O3CPU *cpu_ptr);
329,330c329,330
< /** Pointer to FullCPU. */
< FullCPU *cpu;
---
> /** Pointer to O3CPU. */
> O3CPU *cpu;