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/dev/copy_engine_defs.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/dev/copy_engine_defs.hh')
| -rw-r--r-- | src/dev/copy_engine_defs.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dev/copy_engine_defs.hh b/src/dev/copy_engine_defs.hh index afefac2b5..9a88802ed 100644 --- a/src/dev/copy_engine_defs.hh +++ b/src/dev/copy_engine_defs.hh @@ -125,7 +125,7 @@ struct Regs : public Serializable { uint32_t attnStatus; // Read clears - void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE + void serialize(CheckpointOut &cp) const override { SERIALIZE_SCALAR(chanCount); SERIALIZE_SCALAR(xferCap); @@ -133,7 +133,7 @@ struct Regs : public Serializable { SERIALIZE_SCALAR(attnStatus); } - void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE + void unserialize(CheckpointIn &cp) override { UNSERIALIZE_SCALAR(chanCount); UNSERIALIZE_SCALAR(xferCap); @@ -197,7 +197,7 @@ struct ChanRegs : public Serializable { }; CHANERR error; - void serialize(CheckpointOut &cp) const M5_ATTR_OVERRIDE + void serialize(CheckpointOut &cp) const override { paramOut(cp, "ctrl", ctrl._data); paramOut(cp, "status", status._data); @@ -207,7 +207,7 @@ struct ChanRegs : public Serializable { paramOut(cp, "error", error._data); } - void unserialize(CheckpointIn &cp) M5_ATTR_OVERRIDE + void unserialize(CheckpointIn &cp) override { paramIn(cp, "ctrl", ctrl._data); paramIn(cp, "status", status._data); |