diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
commit | b565660c42cbf8f9ec9442cd6c0b7d488c7816af (patch) | |
tree | aa977395b10e164190efdd5106da54a57bc23b44 /src/sim | |
parent | 8dbab9f701150cf93d33f2a21d6b556507f3d617 (diff) | |
parent | 9ef8bf74c7ab3d34889e804cb4b1e365da090d0b (diff) | |
download | gem5-b565660c42cbf8f9ec9442cd6c0b7d488c7816af.tar.xz |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
Diffstat (limited to 'src/sim')
-rw-r--r-- | src/sim/sim_object.cc | 20 | ||||
-rw-r--r-- | src/sim/sim_object.hh | 2 |
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(); |