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.cc | |
| 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.cc')
| -rw-r--r-- | sim/serialize.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sim/serialize.cc b/sim/serialize.cc index ba5a99afd..f8d6b46bf 100644 --- a/sim/serialize.cc +++ b/sim/serialize.cc @@ -186,7 +186,7 @@ INSTANTIATE_PARAM_TEMPLATES(string) class Globals : public Serializable { public: - string name() const; + const string name() const; void serialize(ostream &os); void unserialize(Checkpoint *cp); }; @@ -194,7 +194,7 @@ class Globals : public Serializable /// The one and only instance of the Globals class. Globals globals; -string +const string Globals::name() const { return "Globals"; |