Merge zizzer:/bk/newmem

into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 42712a50ca46ebc891b78186f4b6d1412a35d374

2 files changed, 0 insertions, 22 deletions

diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index d12b06b7a..8fc8fe58f 100644
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -92,11 +92,6 @@ SimObject::SimObject(const string &_name)
 }
 
 void
-SimObject::connect()
-{
-}
-
-void
 SimObject::init()
 {
 }
@@ -160,21 +155,6 @@ SimObject::regAllStats()
 }
 
 //
-// static function: call connect() on all SimObjects.
-//
-void
-SimObject::connectAll()
-{
-    SimObjectList::iterator i = simObjectList.begin();
-    SimObjectList::iterator end = simObjectList.end();
-
-    for (; i != end; ++i) {
-        SimObject *obj = *i;
-        obj->connect();
-    }
-}
-
-//
 // static function: call init() on all SimObjects.
 //
 void
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh
index 32807b69d..93802e247 100644
--- a/src/sim/sim_object.hh
+++ b/src/sim/sim_object.hh
@@ -101,9 +101,7 @@ class SimObject : public Serializable, protected StartupCallback
     // initialization pass of all objects.
     // Gets invoked after construction, before unserialize.
     virtual void init();
-    virtual void connect();
     static void initAll();
-    static void connectAll();
 
     // register statistics for this object
     virtual void regStats();