diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:07:59 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:07:59 -0400 |
| commit | 22c04190c607b9360d9a23548f8a54e83cf0e74a (patch) | |
| tree | 576135962e3c9c725157b461c8009b05933bba2b /src/sim/sim_object.hh | |
| parent | 735c4a87665119a33443cf8d191d329c66191c6e (diff) | |
| download | gem5-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/sim/sim_object.hh')
| -rw-r--r-- | src/sim/sim_object.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh index d2cedf5be..7c1452f01 100644 --- a/src/sim/sim_object.hh +++ b/src/sim/sim_object.hh @@ -184,7 +184,7 @@ class SimObject : public EventManager, public Serializable, public Drainable * Provide a default implementation of the drain interface for * objects that don't need draining. */ - DrainState drain() M5_ATTR_OVERRIDE { return DrainState::Drained; } + DrainState drain() override { return DrainState::Drained; } /** * Write back dirty buffers to memory using functional writes. @@ -209,8 +209,8 @@ class SimObject : public EventManager, public Serializable, public Drainable */ virtual void memInvalidate() {}; - 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 {}; /** * Serialize all SimObjects in the system. |