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.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/dev/arm/rv_ctrl.hh b/src/dev/arm/rv_ctrl.hh
index 905fe14d9..1a55025a8 100644
--- a/src/dev/arm/rv_ctrl.hh
+++ b/src/dev/arm/rv_ctrl.hh
@@ -171,17 +171,17 @@ class RealViewCtrl : public BasicPioDevice
      * @param pkt The memory request.
      * @param data Where to put the data.
      */
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
 
     /**
      * All writes are simply ignored.
      * @param pkt The memory request.
      * @param data the data
      */
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick write(PacketPtr pkt) override;
 
-    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;
 
   public:
     void registerDevice(DeviceFunc func, uint8_t site, uint8_t pos,
@@ -206,14 +206,14 @@ class RealViewOsc
     RealViewOsc(RealViewOscParams *p);
     virtual ~RealViewOsc() {};
 
-    void startup() M5_ATTR_OVERRIDE;
+    void startup() override;
 
-    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;
 
   public: // RealViewCtrl::Device interface
-    uint32_t read() const M5_ATTR_OVERRIDE;
-    void write(uint32_t freq) M5_ATTR_OVERRIDE;
+    uint32_t read() const override;
+    void write(uint32_t freq) override;
 
   protected:
     void clockPeriod(Tick clock_period);