From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Mon, 9 Feb 2004 08:30:16 +0000 (-0800)
Subject: Results of automatic (yet incomplete) merge.
X-Git-Tag: m5_1.0_beta2~161
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=730296f7f9a0b6ffdfdf0b349fb1f255c987c0ac;p=gem5.git

Results of automatic (yet incomplete) merge.

--HG--
extra : convert_revision : 3ad9a929051bfe111a1e10618c8595acbbade542
---

730296f7f9a0b6ffdfdf0b349fb1f255c987c0ac
diff --cc sim/serialize.cc
index ba5a99afd,d836e7c20..f8d6b46bf
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@@ -186,8 -186,8 +186,8 @@@ INSTANTIATE_PARAM_TEMPLATES(string
  class Globals : public Serializable
  {
    public:
-     string name() const;
+     const string name() const;
 -    void serialize(ostream& os);
 +    void serialize(ostream &os);
      void unserialize(Checkpoint *cp);
  };
  
diff --cc sim/serialize.hh
index e561604bf,43dbd2c85..36622b7fe
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@@ -111,9 -111,9 +111,9 @@@ class Serializabl
      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 serialize(std::ostream &os) {}
      virtual void unserialize(Checkpoint *cp, const std::string &section) {}
  
      static Serializable *create(Checkpoint *cp,