Results of automatic (yet incomplete) merge.

--HG--
extra : convert_revision : 3ad9a929051bfe111a1e10618c8595acbbade542

diff --cc sim/serialize.cc
index ba5a99afd7a5bd09df3961012610832dd233ccab,d836e7c203fa234ff1b275f4175efa03b5f0468a..f8d6b46bf2e03c90f0c3168748986e30fb9839ca
--- 1/sim/serialize.cc
--- 2/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 e561604bf1b9d63db76902cd4f93dd74e73144cb,43dbd2c8586a658c4f866b074ad88108792e6ce0..36622b7fe7bef9eb14c09dd74c1948bd71fdad57
--- 1/sim/serialize.hh
--- 2/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,