From 22c04190c607b9360d9a23548f8a54e83cf0e74a Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
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/dev/arm/hdlcd.hh | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/dev/arm/hdlcd.hh')

diff --git a/src/dev/arm/hdlcd.hh b/src/dev/arm/hdlcd.hh
index cb47b8522..3ce12a24d 100644
--- a/src/dev/arm/hdlcd.hh
+++ b/src/dev/arm/hdlcd.hh
@@ -95,18 +95,18 @@ class HDLcd: public AmbaDmaDevice
     HDLcd(const HDLcdParams *p);
     ~HDLcd();
 
-    void regStats() M5_ATTR_OVERRIDE;
+    void regStats() 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;
 
-    void drainResume() M5_ATTR_OVERRIDE;
+    void drainResume() override;
 
   public: // IO device interface
-    Tick read(PacketPtr pkt) M5_ATTR_OVERRIDE;
-    Tick write(PacketPtr pkt) M5_ATTR_OVERRIDE;
+    Tick read(PacketPtr pkt) override;
+    Tick write(PacketPtr pkt) override;
 
-    AddrRangeList getAddrRanges() const M5_ATTR_OVERRIDE { return addrRanges; }
+    AddrRangeList getAddrRanges() const override { return addrRanges; }
 
   protected: // Parameters
     VncInput *vnc;
@@ -328,16 +328,16 @@ class HDLcd: public AmbaDmaDevice
         void dumpSettings();
 
       protected:
-        bool nextPixel(Pixel &p) M5_ATTR_OVERRIDE { return parent.pxlNext(p); }
+        bool nextPixel(Pixel &p) override { return parent.pxlNext(p); }
 
-        void onVSyncBegin() M5_ATTR_OVERRIDE { return parent.pxlVSyncBegin(); }
-        void onVSyncEnd() M5_ATTR_OVERRIDE { return parent.pxlVSyncEnd(); }
+        void onVSyncBegin() override { return parent.pxlVSyncBegin(); }
+        void onVSyncEnd() override { return parent.pxlVSyncEnd(); }
 
-        void onUnderrun(unsigned x, unsigned y) M5_ATTR_OVERRIDE {
+        void onUnderrun(unsigned x, unsigned y) override {
             parent.pxlUnderrun();
         }
 
-        void onFrameDone() M5_ATTR_OVERRIDE { parent.pxlFrameDone(); }
+        void onFrameDone() override { parent.pxlFrameDone(); }
 
       protected:
         HDLcd &parent;
@@ -366,12 +366,12 @@ class HDLcd: public AmbaDmaDevice
         void abortFrame();
         void dumpSettings();
 
-        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;
 
       protected:
-        void onEndOfBlock() M5_ATTR_OVERRIDE;
-        void onIdle() M5_ATTR_OVERRIDE;
+        void onEndOfBlock() override;
+        void onIdle() override;
 
         HDLcd &parent;
         const size_t lineSize;
-- 
cgit v1.2.3