96,97c96,97
< void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
< void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
---
> void serialize(CheckpointOut &cp) const override;
> void unserialize(CheckpointIn &cp) override;
192,193c192,193
< void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
< void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
---
> void serialize(CheckpointOut &cp) const override;
> void unserialize(CheckpointIn &cp) override;
205,206c205,206
< void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
< void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
---
> void serialize(CheckpointOut &cp) const override;
> void unserialize(CheckpointIn &cp) override;
265c265
< void setMiscReg(int misc_reg, ArmISA::MiscReg val) M5_ATTR_OVERRIDE {
---
> void setMiscReg(int misc_reg, ArmISA::MiscReg val) override {
268c268
< ArmISA::MiscReg readMiscReg(int misc_reg) M5_ATTR_OVERRIDE {
---
> ArmISA::MiscReg readMiscReg(int misc_reg) override {
282,283c282,283
< void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE;
< void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE;
---
> void serialize(CheckpointOut &cp) const override;
> void unserialize(CheckpointIn &cp) override;
286,288c286,288
< AddrRangeList getAddrRanges() const M5_ATTR_OVERRIDE { return addrRanges; }
< Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
< Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
---
> AddrRangeList getAddrRanges() const override { return addrRanges; }
> Tick read(PacketPtr pkt) override;
> Tick write(PacketPtr pkt) override;