diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-31 13:24:00 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-10-31 13:24:00 -0500 |
commit | 7f39644609e19ada9e94c9bbb09c3e625fa6e8ed (patch) | |
tree | b849a7e39abf07fb9325a22e4f71053040adcfc9 /src/sim/sim_object.hh | |
parent | 79d4bede429bb5c3413fcd0cfe6f2d1790c8312d (diff) | |
parent | 17141a1be9c656d2bba77e8853dd3d4cbce01beb (diff) | |
download | gem5-7f39644609e19ada9e94c9bbb09c3e625fa6e8ed.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : 42712a50ca46ebc891b78186f4b6d1412a35d374
Diffstat (limited to 'src/sim/sim_object.hh')
-rw-r--r-- | src/sim/sim_object.hh | 2 |
1 files changed, 0 insertions, 2 deletions
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(); |