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/mem/probes | |
| 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/mem/probes')
| -rw-r--r-- | src/mem/probes/base.hh | 4 | ||||
| -rw-r--r-- | src/mem/probes/mem_trace.hh | 3 | ||||
| -rw-r--r-- | src/mem/probes/stack_dist.hh | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/mem/probes/base.hh b/src/mem/probes/base.hh index ccb5ca749..78e6f6b8d 100644 --- a/src/mem/probes/base.hh +++ b/src/mem/probes/base.hh @@ -65,7 +65,7 @@ class BaseMemProbe : public SimObject public: BaseMemProbe(BaseMemProbeParams *params); - void regProbeListeners() M5_ATTR_OVERRIDE; + void regProbeListeners() override; protected: /** @@ -82,7 +82,7 @@ class BaseMemProbe : public SimObject : ProbeListenerArgBase(pm, name), parent(_parent) {} - void notify(const ProbePoints::PacketInfo &pkt_info) M5_ATTR_OVERRIDE { + void notify(const ProbePoints::PacketInfo &pkt_info) override { parent.handleRequest(pkt_info); } diff --git a/src/mem/probes/mem_trace.hh b/src/mem/probes/mem_trace.hh index 51f272812..d34235eef 100644 --- a/src/mem/probes/mem_trace.hh +++ b/src/mem/probes/mem_trace.hh @@ -52,8 +52,7 @@ class MemTraceProbe : public BaseMemProbe MemTraceProbe(MemTraceProbeParams *params); protected: - void handleRequest(const ProbePoints::PacketInfo &pkt_info) \ - M5_ATTR_OVERRIDE; + void handleRequest(const ProbePoints::PacketInfo &pkt_info) override; /** * Callback to flush and close all open output streams on exit. If diff --git a/src/mem/probes/stack_dist.hh b/src/mem/probes/stack_dist.hh index 8374672da..66b75109a 100644 --- a/src/mem/probes/stack_dist.hh +++ b/src/mem/probes/stack_dist.hh @@ -52,11 +52,10 @@ class StackDistProbe : public BaseMemProbe public: StackDistProbe(StackDistProbeParams *params); - void regStats() M5_ATTR_OVERRIDE; + void regStats() override; protected: - void handleRequest(const ProbePoints::PacketInfo &pkt_info) \ - M5_ATTR_OVERRIDE; + void handleRequest(const ProbePoints::PacketInfo &pkt_info) override; protected: // Cache line size to simulate |