71c71
< typedef typename Impl::FullCPU FullCPU;
---
> typedef typename Impl::O3CPU O3CPU;
83c83
< friend class Impl::FullCPU;
---
> friend class Impl::O3CPU;
129c129
< void setCPU(FullCPU *cpu_ptr);
---
> void setCPU(O3CPU *cpu_ptr);
334c334
< FullCPU *cpu;
---
> O3CPU *cpu;