diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-02-09 00:30:16 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-02-09 00:30:16 -0800 |
commit | 730296f7f9a0b6ffdfdf0b349fb1f255c987c0ac (patch) | |
tree | d1d6a8bd38e86bf2eb328f57a0163d36efa90a6e /sim/serialize.hh | |
parent | 88c5bd695f1716dc9bab58e678c92ffddc306b13 (diff) | |
parent | d7b7363444614a4e07676151604ce9600bad1169 (diff) | |
download | gem5-730296f7f9a0b6ffdfdf0b349fb1f255c987c0ac.tar.xz |
Results of automatic (yet incomplete) merge.
--HG--
extra : convert_revision : 3ad9a929051bfe111a1e10618c8595acbbade542
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) {} |