diff options
| author | Andrew Schultz <alschult@umich.edu> | 2004-02-09 17:50:47 -0500 |
|---|---|---|
| committer | Andrew Schultz <alschult@umich.edu> | 2004-02-09 17:50:47 -0500 |
| commit | eac2d6a66863dcd7d5129ee5112ea49248f9efa8 (patch) | |
| tree | d59508dd612d82b80fef69ded188e2704e074d40 /dev/etherlink.hh | |
| parent | 48bb27be728db65ad521eb5bda8cb3411dfddc43 (diff) | |
| parent | da8a7022126eef87d4007b7135aa89c559eb6747 (diff) | |
| download | gem5-eac2d6a66863dcd7d5129ee5112ea49248f9efa8.tar.xz | |
Merge linux tree with head
arch/alpha/alpha_memory.cc:
dev/alpha_console.cc:
dev/alpha_console.hh:
Merge
--HG--
extra : convert_revision : 3233648f204338ab3f102ff117754dce955dcc37
Diffstat (limited to 'dev/etherlink.hh')
| -rw-r--r-- | dev/etherlink.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/etherlink.hh b/dev/etherlink.hh index 895bac2e1..e1a7957ee 100644 --- a/dev/etherlink.hh +++ b/dev/etherlink.hh @@ -89,7 +89,7 @@ class EtherLink : public SimObject Link(const std::string &name, double rate, EtherDump *dump); ~Link() {} - virtual std::string name() const { return objName; } + virtual const std::string name() const { return objName; } bool busy() const { return (bool)packet; } bool transmit(PacketPtr &packet); |