Merge zizzer.eecs.umich.edu:/bk/m5

into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel

--HG--
extra : convert_revision : 9ee9b8550b5761fa400df83caf268bd1c8ddc7ed

2 files changed, 5 insertions, 5 deletions

diff --git a/sim/serialize.cc b/sim/serialize.cc
index 180cc38a0..ba5a99afd 100644
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@ -187,7 +187,7 @@ class Globals : public Serializable
 {
   public:
     string name() const;
-    void serialize(ostream& os);
+    void serialize(ostream &os);
     void unserialize(Checkpoint *cp);
 };
 
@@ -201,7 +201,7 @@ Globals::name() const
 }
 
 void
-Globals::serialize(ostream& os)
+Globals::serialize(ostream &os)
 {
     nameOut(os);
     SERIALIZE_SCALAR(curTick);
diff --git a/sim/serialize.hh b/sim/serialize.hh
index 9ab2fa833..e561604bf 100644
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@ -103,8 +103,8 @@ objParamIn(Checkpoint *cp, const std::string &section,
 class Serializable
 {
   protected:
-    void nameOut(std::ostream& os);
-    void nameOut(std::ostream& os, const std::string &_name);
+    void nameOut(std::ostream &os);
+    void nameOut(std::ostream &os, const std::string &_name);
 
   public:
     Serializable() {}
@@ -113,7 +113,7 @@ class Serializable
     // manditory virtual function, so objects must provide names
     virtual 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,