From 22c04190c607b9360d9a23548f8a54e83cf0e74a Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Mon, 12 Oct 2015 04:07:59 -0400 Subject: misc: Remove redundant compiler-specific defines This patch moves away from using M5_ATTR_OVERRIDE and the m5::hashmap (and similar) abstractions, as these are no longer needed with gcc 4.7 and clang 3.1 as minimum compiler versions. --- src/arch/mips/interrupts.hh | 4 ++-- src/arch/mips/tlb.hh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/arch/mips') diff --git a/src/arch/mips/interrupts.hh b/src/arch/mips/interrupts.hh index 3c9165bfa..b5323e4e1 100755 --- a/src/arch/mips/interrupts.hh +++ b/src/arch/mips/interrupts.hh @@ -116,13 +116,13 @@ class Interrupts : public SimObject void - serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE + serialize(CheckpointOut &cp) const override { fatal("Serialization of Interrupts Unimplemented for MIPS"); } void - unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE + unserialize(CheckpointIn &cp) override { fatal("Unserialization of Interrupts Unimplemented for MIPS"); } diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh index 5a9069e4c..a2f356e1f 100644 --- a/src/arch/mips/tlb.hh +++ b/src/arch/mips/tlb.hh @@ -107,8 +107,8 @@ class TLB : public BaseTLB static Fault checkCacheability(RequestPtr &req); // Checkpointing - 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; void regStats(); -- cgit v1.2.3