diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 13:02:47 -0500 |
| commit | aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d (patch) | |
| tree | f48c9d361d04cc6276ef33a9898eb0ac61de36d7 /dev/etherlink.hh | |
| parent | 783f701247a1013a32d7caab324660c211215a11 (diff) | |
| parent | f31a27a030d2e93fef2934aa8642609bb38974af (diff) | |
| download | gem5-aed3e6780a54f2d4f008a8cf7f66e2bbdc788a0d.tar.xz | |
Merge changes to make m5 g++ 3.4 compatible.
sim/param.cc:
Merge changes.
--HG--
extra : convert_revision : b5044e1f7c48ae2d74d5233dd4fabfb7a801d7c8
Diffstat (limited to 'dev/etherlink.hh')
| -rw-r--r-- | dev/etherlink.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dev/etherlink.hh b/dev/etherlink.hh index e998a006f..d5cd7d7c8 100644 --- a/dev/etherlink.hh +++ b/dev/etherlink.hh @@ -30,13 +30,13 @@ * Device module for modelling a fixed bandwidth full duplex ethernet link */ -#ifndef __ETHERLINK_HH__ -#define __ETHERLINK_HH__ +#ifndef __DEV_ETHERLINK_HH__ +#define __DEV_ETHERLINK_HH__ -#include "sim/host.hh" -#include "sim/eventq.hh" #include "dev/etherint.hh" #include "dev/etherpkt.hh" +#include "sim/eventq.hh" +#include "sim/host.hh" #include "sim/sim_object.hh" class EtherDump; @@ -71,7 +71,7 @@ class EtherLink : public SimObject PacketPtr packet; void txDone(); typedef EventWrapper<Link, &Link::txDone> DoneEvent; - friend class DoneEvent; + friend void DoneEvent::process(); DoneEvent doneEvent; friend class LinkDelayEvent; |