summaryrefslogtreecommitdiff
path: root/src/dev/tcp_iface.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/tcp_iface.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/tcp_iface.hh')
-rw-r--r--src/dev/tcp_iface.hh9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/dev/tcp_iface.hh b/src/dev/tcp_iface.hh
index d34d3d002..553f862ca 100644
--- a/src/dev/tcp_iface.hh
+++ b/src/dev/tcp_iface.hh
@@ -98,19 +98,18 @@ class TCPIface : public MultiIface
virtual void
sendRaw(void *buf, unsigned length,
- const MultiHeaderPkt::AddressType dest_addr=nullptr)
- M5_ATTR_OVERRIDE
+ const MultiHeaderPkt::AddressType dest_addr=nullptr) override
{
sendTCP(sock, buf, length);
}
- virtual bool recvRaw(void *buf, unsigned length) M5_ATTR_OVERRIDE
+ virtual bool recvRaw(void *buf, unsigned length) override
{
return recvTCP(sock, buf, length);
}
virtual void syncRaw(MultiHeaderPkt::MsgType sync_req,
- Tick sync_tick) M5_ATTR_OVERRIDE;
+ Tick sync_tick) override;
public:
/**
@@ -128,7 +127,7 @@ class TCPIface : public MultiIface
unsigned multi_rank, Tick sync_start, Tick sync_repeat,
EventManager *em);
- ~TCPIface() M5_ATTR_OVERRIDE;
+ ~TCPIface() override;
};
#endif