From 94807214c417f3124e2824597c2867f91c1017b3 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 7 Jan 2011 21:50:29 -0800 Subject: sim: clean up CountedDrainEvent slightly. There's no reason for it to derive from SimLoopExitEvent. This whole drain thing needs to be redone eventually, but this is a stopgap to make later changes to SimLoopExitEvent feasible. --- src/sim/sim_events.cc | 4 ++-- src/sim/sim_events.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sim/sim_events.cc b/src/sim/sim_events.cc index d53fca3c3..6d743cac6 100644 --- a/src/sim/sim_events.cc +++ b/src/sim/sim_events.cc @@ -85,14 +85,14 @@ exitSimLoop(const std::string &message, int exit_code, Tick when, Tick repeat) } CountedDrainEvent::CountedDrainEvent() - : SimLoopExitEvent("Finished drain", 0), count(0) + : count(0) { } void CountedDrainEvent::process() { if (--count == 0) - exitSimLoop(cause, code); + exitSimLoop("Finished drain", 0); } // diff --git a/src/sim/sim_events.hh b/src/sim/sim_events.hh index 17e2cc202..6ea361a05 100644 --- a/src/sim/sim_events.hh +++ b/src/sim/sim_events.hh @@ -55,7 +55,7 @@ class SimLoopExitEvent : public Event virtual const char *description() const; }; -class CountedDrainEvent : public SimLoopExitEvent +class CountedDrainEvent : public Event { private: // Count of how many objects have not yet drained -- cgit v1.2.3