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 /sim/serialize.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 'sim/serialize.hh')
| -rw-r--r-- | sim/serialize.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sim/serialize.hh b/sim/serialize.hh index e561604bf..36622b7fe 100644 --- a/sim/serialize.hh +++ b/sim/serialize.hh @@ -111,7 +111,7 @@ class Serializable virtual ~Serializable() {} // manditory virtual function, so objects must provide names - virtual std::string name() const = 0; + virtual const std::string name() const = 0; virtual void serialize(std::ostream &os) {} virtual void unserialize(Checkpoint *cp, const std::string §ion) {} |