--- a/src/simulator/scheduler.cc Mon Dec 11 19:36:48 2006 +0100
+++ b/src/simulator/scheduler.cc Mon Dec 11 19:37:53 2006 +0100
@@ -84,10 +84,5 @@
assert (!RealIsEmpty ());
return RealRemove (id, key);
}
-bool
-Scheduler::IsValid (EventId id)
-{
- return RealIsValid (id);
-}
}; // namespace ns3
--- a/src/simulator/scheduler.h Mon Dec 11 19:36:48 2006 +0100
+++ b/src/simulator/scheduler.h Mon Dec 11 19:37:53 2006 +0100
@@ -71,7 +71,6 @@
Scheduler::EventKey PeekNextKey (void) const ;
void RemoveNext (void);
EventImpl *Remove (EventId id, EventKey *key);
- bool IsValid (EventId id);
private:
/**
@@ -113,12 +112,6 @@
* This methods cannot be invoked if the list is empty.
*/
virtual EventImpl *RealRemove (EventId id, EventKey *key) = 0;
- /**
- * \param id event id to validate
- * \returns true if the event id identifies an existing valid
- * event stored in the event list and false otherwise.
- */
- virtual bool RealIsValid (EventId id) = 0;
};
}; // namespace ns3
--- a/src/simulator/simulator.cc Mon Dec 11 19:36:48 2006 +0100
+++ b/src/simulator/simulator.cc Mon Dec 11 19:37:53 2006 +0100
@@ -241,7 +241,6 @@
void
SimulatorPrivate::Cancel (EventId id)
{
- assert (m_events->IsValid (id));
EventImpl *ev = id.GetEventImpl ();
ev->Cancel ();
}