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.

2 files changed, 6 insertions, 7 deletions

diff --git a/src/cpu/minor/cpu.hh b/src/cpu/minor/cpu.hh
index 99b915693..5bfc3b29f 100644
--- a/src/cpu/minor/cpu.hh
+++ b/src/cpu/minor/cpu.hh
@@ -128,7 +128,7 @@ class MinorCPU : public BaseCPU
     /** Starting, waking and initialisation */
     void init();
     void startup();
-    void wakeup(ThreadID tid) M5_ATTR_OVERRIDE;
+    void wakeup(ThreadID tid) override;
 
     Addr dbg_vtophys(Addr addr);
 
@@ -142,17 +142,16 @@ class MinorCPU : public BaseCPU
     Counter totalInsts() const;
     Counter totalOps() const;
 
-    void serializeThread(CheckpointOut &cp,
-                         ThreadID tid) const M5_ATTR_OVERRIDE;
-    void unserializeThread(CheckpointIn &cp, ThreadID tid) M5_ATTR_OVERRIDE;
+    void serializeThread(CheckpointOut &cp, ThreadID tid) const override;
+    void unserializeThread(CheckpointIn &cp, ThreadID tid) override;
 
     /** Serialize pipeline data */
     void serialize(CheckpointOut &cp) const;
     void unserialize(CheckpointIn &cp);
 
     /** Drain interface */
-    DrainState drain() M5_ATTR_OVERRIDE;
-    void drainResume() M5_ATTR_OVERRIDE;
+    DrainState drain() override;
+    void drainResume() override;
     /** Signal from Pipeline that MinorCPU should signal that a drain
      *  is complete and set its drainState */
     void signalDrainDone();
diff --git a/src/cpu/minor/pipeline.hh b/src/cpu/minor/pipeline.hh
index bf2071b02..213def58e 100644
--- a/src/cpu/minor/pipeline.hh
+++ b/src/cpu/minor/pipeline.hh
@@ -126,7 +126,7 @@ class Pipeline : public Ticked
      *  stages and pipeline advance) */
     void evaluate();
 
-    void countCycles(Cycles delta) M5_ATTR_OVERRIDE
+    void countCycles(Cycles delta) override
     {
         cpu.ppCycles->notify(delta);
     }