summaryrefslogtreecommitdiff
path: root/src/dev/x86/i8042.hh
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2015-10-12 04:07:59 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2015-10-12 04:07:59 -0400
commit22c04190c607b9360d9a23548f8a54e83cf0e74a (patch)
tree576135962e3c9c725157b461c8009b05933bba2b /src/dev/x86/i8042.hh
parent735c4a87665119a33443cf8d191d329c66191c6e (diff)
downloadgem5-22c04190c607b9360d9a23548f8a54e83cf0e74a.tar.xz
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.
Diffstat (limited to 'src/dev/x86/i8042.hh')
-rw-r--r--src/dev/x86/i8042.hh10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/dev/x86/i8042.hh b/src/dev/x86/i8042.hh
index fd32b4c53..bddbe9b27 100644
--- a/src/dev/x86/i8042.hh
+++ b/src/dev/x86/i8042.hh
@@ -120,10 +120,8 @@ class PS2Mouse : public PS2Device
bool processData(uint8_t data);
- void serialize(const std::string &base,
- CheckpointOut &cp) const M5_ATTR_OVERRIDE;
- void unserialize(const std::string &base,
- CheckpointIn &cp) M5_ATTR_OVERRIDE;
+ void serialize(const std::string &base, CheckpointOut &cp) const override;
+ void unserialize(const std::string &base, CheckpointIn &cp) override;
};
class PS2Keyboard : public PS2Device
@@ -249,8 +247,8 @@ class I8042 : public BasicPioDevice
Tick write(PacketPtr pkt);
- 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;
};
} // namespace X86ISA